r49075 - in /desktop/unstable/gnome-boxes/debian: changelog patches/ patches/01_Ensure_disk_reability_on_import.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Wed Jun 15 12:18:49 2016
New Revision: 49075

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49075
Log:
debian/patches/01_Ensure_disk_reability_on_import.patch: Only check system
disk image readability when trying effectively trying to import it.

Added:
    desktop/unstable/gnome-boxes/debian/patches/
    desktop/unstable/gnome-boxes/debian/patches/01_Ensure_disk_reability_on_import.patch
    desktop/unstable/gnome-boxes/debian/patches/series
Modified:
    desktop/unstable/gnome-boxes/debian/changelog

Modified: desktop/unstable/gnome-boxes/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-boxes/debian/changelog?rev=49075&op=diff
==============================================================================
--- desktop/unstable/gnome-boxes/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-boxes/debian/changelog	[utf-8] Wed Jun 15 12:18:49 2016
@@ -1,3 +1,10 @@
+gnome-boxes (3.20.2-2) unstable; urgency=medium
+
+  * debian/patches/01_Ensure_disk_reability_on_import.patch: Only check system
+    disk image readability when trying effectively trying to import it.
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 15 Jun 2016 14:10:12 +0200
+
 gnome-boxes (3.20.2-1) unstable; urgency=medium
 
   * New upstream release

Added: desktop/unstable/gnome-boxes/debian/patches/01_Ensure_disk_reability_on_import.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-boxes/debian/patches/01_Ensure_disk_reability_on_import.patch?rev=49075&op=file
==============================================================================
--- desktop/unstable/gnome-boxes/debian/patches/01_Ensure_disk_reability_on_import.patch	(added)
+++ desktop/unstable/gnome-boxes/debian/patches/01_Ensure_disk_reability_on_import.patch	[utf-8] Wed Jun 15 12:18:49 2016
@@ -0,0 +1,51 @@
+From cec7c7fc8f9b1d2c542da7e4e8a023abd5d4bbbd Mon Sep 17 00:00:00 2001
+From: "Zeeshan Ali (Khattak)" <zeeshanak at gnome.org>
+Date: Wed, 25 May 2016 15:50:19 +0100
+Subject: system-importer: Ensure disk reability on import
+
+Ensuring disk readability involves elevation of privileges so if we do
+that on startup, we end up launching a polkit dialog even if user never
+uses the option of libvirt system VMs.
+
+While we should still check for disk images before showing the option to
+import their VMs from system libvirt, it's best if we only ensure their
+reabibility when user explicitly asks for import.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766727
+---
+ src/libvirt-system-importer.vala | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/libvirt-system-importer.vala b/src/libvirt-system-importer.vala
+index b273b47..f70144b 100644
+--- a/src/libvirt-system-importer.vala
++++ b/src/libvirt-system-importer.vala
+@@ -66,6 +66,12 @@ private class Boxes.LibvirtSystemImporter: GLib.Object {
+             }
+         }
+ 
++        debug ("Fetched %u domains from system libvirt.", this.domains.length ());
++        if (this.domains.length () == 0)
++            throw new LibvirtSystemImporterError.NO_IMPORTS (_("No boxes to import"));
++    }
++
++    public async void import () {
+         try {
+             yield ensure_disks_readable (disk_paths);
+         } catch (GLib.Error error) {
+@@ -74,12 +80,6 @@ private class Boxes.LibvirtSystemImporter: GLib.Object {
+             return;
+         }
+ 
+-        debug ("Fetched %u domains from system libvirt.", this.domains.length ());
+-        if (this.domains.length () == 0)
+-            throw new LibvirtSystemImporterError.NO_IMPORTS (_("No boxes to import"));
+-    }
+-
+-    public async void import () {
+         for (var i = 0; i < configs.length; i++)
+             import_domain.begin (configs[i], disk_paths[i], null);
+     }
+-- 
+cgit v0.12
+

Added: desktop/unstable/gnome-boxes/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-boxes/debian/patches/series?rev=49075&op=file
==============================================================================
--- desktop/unstable/gnome-boxes/debian/patches/series	(added)
+++ desktop/unstable/gnome-boxes/debian/patches/series	[utf-8] Wed Jun 15 12:18:49 2016
@@ -0,0 +1 @@
+01_Ensure_disk_reability_on_import.patch