[Pkg-libvirt-commits] [SCM] Virt Manager packaging branch, master, updated. debian/0.6.1-1-1-gd0da6be

[Guido Günther]

The following commit has been merged in the master branch:
commit d0da6be0846ec01df64550f7815a8db8ebfe38ac
Author: Guido Günther <agx at sigxcpu.org>
Date:   Sat Feb 7 21:37:16 2009 +0100

    remove disambiguity in storage dialog
    
    Closes: #514324

diff --git a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
index 6338ab2..369cac5 100644
--- a/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
+++ b/debian/patches/0001-use-usr-share-gconf-for-schema-data.patch
@@ -1,4 +1,3 @@
-From efa101409761eeebbdc36fce05b18f978741b78a Mon Sep 17 00:00:00 2001
 From: Guido Guenther <agx at sigxcpu.org>
 Date: Thu, 18 Sep 2008 22:55:16 +0200
 Subject: [PATCH] use /usr/share/gconf for schema data
@@ -21,5 +20,3 @@ index 250e10d..e424887 100644
  schema_DATA = $(PACKAGE).schemas
  
 -- 
-1.5.6.5
-
diff --git a/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch b/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch
new file mode 100644
index 0000000..71d62ca
--- /dev/null
+++ b/debian/patches/0002-remove-disambiguity-in-storage-dialog.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Sat, 7 Feb 2009 21:35:20 +0100
+Subject: [PATCH] remove disambiguity in storage dialog
+
+Closes: #514324
+---
+ src/virtManager/addhardware.py |    2 +-
+ src/virtManager/create.py      |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
+index ecf013d..db35d1d 100644
+--- a/src/virtManager/addhardware.py
++++ b/src/virtManager/addhardware.py
+@@ -800,7 +800,7 @@ class vmmAddHardware(gobject.GObject):
+ 
+             ret = self._dev.is_size_conflict()
+             if not ret[0] and ret[1]:
+-                res = self.err.yes_no(_("Not Enough Free Space"), ret[1])
++                res = self.err.yes_no(_("Not Enough Free Space"), _("%s. Continue anyway?") % ret[1])
+                 if not res:
+                     return False
+ 
+diff --git a/src/virtManager/create.py b/src/virtManager/create.py
+index 63df1c8..903ff36 100644
+--- a/src/virtManager/create.py
++++ b/src/virtManager/create.py
+@@ -1018,7 +1018,7 @@ class vmmCreate(gobject.GObject):
+ 
+             ret = self._disk.is_size_conflict()
+             if not ret[0] and ret[1]:
+-                res = self.err.yes_no(_("Not Enough Free Space"), ret[1])
++                res = self.err.yes_no(_("Not Enough Free Space"), _("%s. Continue anyway?") % ret[1])
+                 if not res:
+                     return False
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index dacd57a..bccbc8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-use-usr-share-gconf-for-schema-data.patch
+0002-remove-disambiguity-in-storage-dialog.patch

-- 
Virt Manager packaging