[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.4-1-1-ge82a6ec

[Laurent Léonard]

The following commit has been merged in the master branch:
commit e82a6ec2a1eb3ae8a1a8d98263d9c66eef178630
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Mon May 6 18:27:13 2013 +0200

    Drop patch
    
    0004-virt-install-avoid-disk-name-collisions.patch - fixed upstream https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=65602bd6ca1dce11f4f818dbb03c44d014b601b2

diff --git a/debian/patches/0005-Don-t-fail-if-no-meter-is-used.patch b/debian/patches/0004-Don-t-fail-if-no-meter-is-used.patch
similarity index 100%
rename from debian/patches/0005-Don-t-fail-if-no-meter-is-used.patch
rename to debian/patches/0004-Don-t-fail-if-no-meter-is-used.patch
diff --git a/debian/patches/0004-virt-install-avoid-disk-name-collisions.patch b/debian/patches/0004-virt-install-avoid-disk-name-collisions.patch
deleted file mode 100644
index 9b01230..0000000
--- a/debian/patches/0004-virt-install-avoid-disk-name-collisions.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Thu, 4 Oct 2012 11:05:12 +0200
-Subject: virt-install: avoid disk name collisions
-
-When specifying multiple disks in pool without giving a name:
-
-virt-install \
-  --disk=pool=test,bus=virtio,size=3.0,sparse=false
-  --disk=pool=test,bus=virtio,size=3.0,sparse=false
-  ...
-
-virt-install creates the names before hand which leads to name
-collisions later on. Avoid this by filling in a collision list
-with the image basenames.
-
-This is overly cautions but better than running into a name collision
-during the vm install.
----
- virt-install    |    4 +++-
- virtinst/cli.py |   10 ++++++----
- 2 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/virt-install b/virt-install
-index ac3875b..7ae2023 100755
---- a/virt-install
-+++ b/virt-install
-@@ -134,7 +134,9 @@ def get_disk(diskopts, size, sparse, guest, is_file_path):
-         if is_file_path:
-             path = diskopts
-         else:
--            dev, size = cli.parse_disk(guest, diskopts)
-+            collidelist = [os.path.basename(disk.path) for disk in guest.disks]
-+            dev, size = cli.parse_disk(guest, diskopts,
-+                                       collidelist=collidelist)
-             path = dev.path
-             sparse = dev.sparse
- 
-diff --git a/virtinst/cli.py b/virtinst/cli.py
-index 79d59d9..231218b 100644
---- a/virtinst/cli.py
-+++ b/virtinst/cli.py
-@@ -1486,7 +1486,7 @@ def parse_security(guest, security):
- 
- _disk_counter = itertools.count()
- 
--def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
-+def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse, collidelist=None):
-     abspath = None
-     volinst = None
-     volobj = None
-@@ -1511,7 +1511,8 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
-                                             pool_name=pool,
-                                             name=guest.name,
-                                             suffix=".img",
--                                            start_num=_disk_counter.next())
-+                                            start_num=_disk_counter.next(),
-+                                            collidelist=collidelist)
-         volinst = vc(pool_name=pool, name=vname, conn=guest.conn,
-                      allocation=0, capacity=(size and
-                                              size * 1024 * 1024 * 1024))
-@@ -1539,7 +1540,7 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
- 
-     return abspath, volinst, volobj
- 
--def parse_disk(guest, optstr, dev=None):
-+def parse_disk(guest, optstr, dev=None, collidelist=None):
-     """
-     helper to properly parse --disk options
-     """
-@@ -1605,7 +1606,8 @@ def parse_disk(guest, optstr, dev=None):
-     device = opt_get("device")
- 
-     abspath, volinst, volobj = _parse_disk_source(guest, path, pool, vol,
--                                                  size, fmt, sparse)
-+                                                  size, fmt, sparse,
-+                                                  collidelist)
- 
-     if not dev:
-         # Build a stub device that should always validate cleanly
diff --git a/debian/patches/series b/debian/patches/series
index c37158f..62d3f5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-fix-path-to-hvmloader.patch
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
-0004-virt-install-avoid-disk-name-collisions.patch
-0005-Don-t-fail-if-no-meter-is-used.patch
+0004-Don-t-fail-if-no-meter-is-used.patch

-- 
Virtinst Debian packaging