[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.3-3-4-g8d455a1
Laurent Léonard
laurent at open-minds.org
Fri May 3 23:15:36 UTC 2013
The following commit has been merged in the master branch:
commit bd437d558dc0b8d4b3a23c8bfab66cb5fabfc0de
Author: Laurent Léonard <laurent at open-minds.org>
Date: Sat May 4 00:57:08 2013 +0200
Drop patches
0004-LogicalPool-properly-pass-on-autostart-flag.patch - fixed upstream https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=65602bd6ca1dce11f4f818dbb03c44d014b601b2
0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch - fixed upstream https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=77b22c5c9c442a4f7b6d84be1d3d7bb7758f1494
0008-The-Debian-stable-release-always-exists.patch - fixed upstream https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=82de8605a794bf5fddc9a87a1f0a1c9af1f94ff0
0009-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch - fixed upstream https://git.fedorahosted.org/cgit/python-virtinst.git/commit/?id=0ac06166fc116e3c8dd2591830f8db4b129b658f
diff --git a/debian/patches/0001-fix-path-to-hvmloader.patch b/debian/patches/0001-fix-path-to-hvmloader.patch
index 6541690..fc4a349 100644
--- a/debian/patches/0001-fix-path-to-hvmloader.patch
+++ b/debian/patches/0001-fix-path-to-hvmloader.patch
@@ -8,7 +8,7 @@ Closes: #487682
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/Installer.py b/virtinst/Installer.py
-index 0e1a714..2059972 100644
+index 796cc86..61f6387 100644
--- a/virtinst/Installer.py
+++ b/virtinst/Installer.py
@@ -325,7 +325,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
diff --git a/debian/patches/0002-Fix-path-to-pygrub.patch b/debian/patches/0002-Fix-path-to-pygrub.patch
index 841ebd5..f46a770 100644
--- a/debian/patches/0002-Fix-path-to-pygrub.patch
+++ b/debian/patches/0002-Fix-path-to-pygrub.patch
@@ -7,7 +7,7 @@ Subject: Fix path to pygrub
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index 2977e08..fc0fa66 100644
+index d012692..1d2a1f6 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -397,11 +397,11 @@ def pygrub_path(conn=None):
diff --git a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
index 3d9665b..52fceb7 100644
--- a/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
+++ b/debian/patches/0003-Fix-path-to-keyboard-configuration.patch
@@ -8,7 +8,7 @@ Since console-setup 1.47 the keyboard configuration is in a new package keyboard
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/virtinst/util.py b/virtinst/util.py
-index fc0fa66..b391de7 100644
+index 1d2a1f6..17e017d 100644
--- a/virtinst/util.py
+++ b/virtinst/util.py
@@ -44,7 +44,7 @@ import support
diff --git a/debian/patches/0004-LogicalPool-properly-pass-on-autostart-flag.patch b/debian/patches/0004-LogicalPool-properly-pass-on-autostart-flag.patch
deleted file mode 100644
index b9dd7d3..0000000
--- a/debian/patches/0004-LogicalPool-properly-pass-on-autostart-flag.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 5 Sep 2012 15:56:24 +0200
-Subject: LogicalPool: properly pass on autostart flag
-
-Otherwise setting autostart on pool creation doesn't work.
----
- virtinst/Storage.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/virtinst/Storage.py b/virtinst/Storage.py
-index 0397899..1ea1bd2 100644
---- a/virtinst/Storage.py
-+++ b/virtinst/Storage.py
-@@ -741,7 +741,7 @@ class LogicalPool(StoragePool):
- raise ValueError(_("Must explicitly specify source path if "
- "building pool"))
- return StoragePool.install(self, meter=meter, create=create,
-- build=build, autostart=False)
-+ build=build, autostart=autostart)
-
- class DiskPool(StoragePool):
- """
diff --git a/debian/patches/0006-virt-install-avoid-disk-name-collisions.patch b/debian/patches/0004-virt-install-avoid-disk-name-collisions.patch
similarity index 74%
rename from debian/patches/0006-virt-install-avoid-disk-name-collisions.patch
rename to debian/patches/0004-virt-install-avoid-disk-name-collisions.patch
index 885db16..9b01230 100644
--- a/debian/patches/0006-virt-install-avoid-disk-name-collisions.patch
+++ b/debian/patches/0004-virt-install-avoid-disk-name-collisions.patch
@@ -21,7 +21,7 @@ during the vm install.
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/virt-install b/virt-install
-index d2cc37a..18227ce 100755
+index ac3875b..7ae2023 100755
--- a/virt-install
+++ b/virt-install
@@ -134,7 +134,9 @@ def get_disk(diskopts, size, sparse, guest, is_file_path):
@@ -36,29 +36,29 @@ index d2cc37a..18227ce 100755
sparse = dev.sparse
diff --git a/virtinst/cli.py b/virtinst/cli.py
-index 580eefd..e0d8f21 100644
+index 79d59d9..231218b 100644
--- a/virtinst/cli.py
+++ b/virtinst/cli.py
-@@ -1477,7 +1477,7 @@ def parse_security(guest, security):
- # --disk parsing #
- ##################
+@@ -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
-@@ -1501,7 +1501,8 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
- vname = virtinst.Storage.StorageVolume.find_free_name(conn=guest.conn,
- pool_name=pool,
- name=guest.name,
-- suffix=".img")
-+ suffix=".img",
-+ collidelist=collidelist)
+@@ -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))
-@@ -1529,7 +1530,7 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
+@@ -1539,7 +1540,7 @@ def _parse_disk_source(guest, path, pool, vol, size, fmt, sparse):
return abspath, volinst, volobj
@@ -67,7 +67,7 @@ index 580eefd..e0d8f21 100644
"""
helper to properly parse --disk options
"""
-@@ -1595,7 +1596,8 @@ def parse_disk(guest, optstr, dev=None):
+@@ -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,
diff --git a/debian/patches/0007-Don-t-fail-if-no-meter-is-used.patch b/debian/patches/0005-Don-t-fail-if-no-meter-is-used.patch
similarity index 87%
rename from debian/patches/0007-Don-t-fail-if-no-meter-is-used.patch
rename to debian/patches/0005-Don-t-fail-if-no-meter-is-used.patch
index 30a05c1..1e6542c 100644
--- a/debian/patches/0007-Don-t-fail-if-no-meter-is-used.patch
+++ b/debian/patches/0005-Don-t-fail-if-no-meter-is-used.patch
@@ -8,10 +8,10 @@ like in the other modules
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/virtinst/DistroInstaller.py b/virtinst/DistroInstaller.py
-index 3a3b5a7..f5e03a0 100644
+index a165827..05cda90 100644
--- a/virtinst/DistroInstaller.py
+++ b/virtinst/DistroInstaller.py
-@@ -125,8 +125,9 @@ def _upload_file(conn, meter, destpool, src):
+@@ -130,8 +130,9 @@ def _upload_file(conn, meter, destpool, src):
# Start transfer
total = 0
@@ -23,7 +23,7 @@ index 3a3b5a7..f5e03a0 100644
while True:
#blocksize = (1024 ** 2)
blocksize = 1024
-@@ -136,11 +137,13 @@ def _upload_file(conn, meter, destpool, src):
+@@ -141,11 +142,13 @@ def _upload_file(conn, meter, destpool, src):
safe_send(data)
total += len(data)
diff --git a/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch b/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch
deleted file mode 100644
index b89cb8e..0000000
--- a/debian/patches/0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
-Date: Wed, 19 Sep 2012 20:56:34 +0200
-Subject: Don't overwrite target element for disks that have it already set
-
-This makes the usage consistent with the bus element just above and
-allows to setup the target device before adding it to the Installer.
----
- tests/cli-test-xml/compare/image-boot0.xml | 2 +-
- tests/cli-test-xml/compare/image-nogfx.xml | 2 +-
- tests/image-xml/image2guest/image-format-out.xml | 2 +-
- virtinst/Guest.py | 5 ++++-
- 4 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/tests/cli-test-xml/compare/image-boot0.xml b/tests/cli-test-xml/compare/image-boot0.xml
-index 0c9b426..ac4ce01 100644
---- a/tests/cli-test-xml/compare/image-boot0.xml
-+++ b/tests/cli-test-xml/compare/image-boot0.xml
-@@ -18,7 +18,7 @@
- </disk>
- <disk type='file' device='disk'>
- <source file='/tmp/__virtinst__cli_scratch.raw'/>
-- <target dev='xvdb' bus='xen'/>
-+ <target dev='xvdc' bus='xen'/>
- </disk>
- <interface type='user'>
- <mac address='00:11:22:33:44:55'/>
-diff --git a/tests/cli-test-xml/compare/image-nogfx.xml b/tests/cli-test-xml/compare/image-nogfx.xml
-index a7efb38..6f63242 100644
---- a/tests/cli-test-xml/compare/image-nogfx.xml
-+++ b/tests/cli-test-xml/compare/image-nogfx.xml
-@@ -18,7 +18,7 @@
- </disk>
- <disk type='file' device='disk'>
- <source file='/tmp/__virtinst__cli_scratch.raw'/>
-- <target dev='xvdb' bus='xen'/>
-+ <target dev='xvdc' bus='xen'/>
- </disk>
- <interface type='user'>
- <mac address='00:11:22:33:44:55'/>
-diff --git a/tests/image-xml/image2guest/image-format-out.xml b/tests/image-xml/image2guest/image-format-out.xml
-index 396bbc4..16bc30c 100644
---- a/tests/image-xml/image2guest/image-format-out.xml
-+++ b/tests/image-xml/image2guest/image-format-out.xml
-@@ -30,7 +30,7 @@
- <disk type='file' device='disk'>
- <driver name='qemu' type='vmdk'/>
- <source file='REPLACEME/tests/image-xml/image-format.xml'/>
-- <target dev='hdd' bus='ide'/>
-+ <target dev='hdc' bus='ide'/>
- </disk>
- <input type='mouse' bus='ps2'/>
- <graphics type='sdl' display=':3.4' xauth='/tmp/.Xauthority'/>
-diff --git a/virtinst/Guest.py b/virtinst/Guest.py
-index 23b4946..1ff2db2 100644
---- a/virtinst/Guest.py
-+++ b/virtinst/Guest.py
-@@ -1510,7 +1510,10 @@ class Guest(XMLBuilderDomain.XMLBuilderDomain):
- disk.bus = "ide"
- elif self.installer.is_xenpv():
- disk.bus = "xen"
-- used_targets.append(disk.generate_target(used_targets))
-+ if disk.target:
-+ used_targets.append(disk.target)
-+ else:
-+ used_targets.append(disk.generate_target(used_targets))
-
- # Set sound device model
- sound_model = self._lookup_device_param(soundtype, "model")
diff --git a/debian/patches/0008-The-Debian-stable-release-always-exists.patch b/debian/patches/0008-The-Debian-stable-release-always-exists.patch
deleted file mode 100644
index 0998fa4..0000000
--- a/debian/patches/0008-The-Debian-stable-release-always-exists.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Geoff Simmons <gsimmons at gsimmons.org>
-Date: Sat, 13 Oct 2012 01:34:52 +0200
-Subject: The Debian stable release always exists.
-
-Release names go away.
----
- man/en/virt-install.1 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/man/en/virt-install.1 b/man/en/virt-install.1
-index 5b76993..ab3fa73 100644
---- a/man/en/virt-install.1
-+++ b/man/en/virt-install.1
-@@ -333,7 +333,7 @@ Some distro specific url samples:
- http://download.fedoraproject.org/pub/fedora/linux/releases/10/Fedora/i386/os/
- .IP "Debian/Ubuntu" 4
- .IX Item "Debian/Ubuntu"
--http://ftp.us.debian.org/debian/dists/etch/main/installer\-amd64/
-+http://ftp.us.debian.org/debian/dists/stable/main/installer\-amd64/
- .IP "Suse" 4
- .IX Item "Suse"
- http://download.opensuse.org/distribution/11.0/repo/oss/
diff --git a/debian/patches/0009-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch b/debian/patches/0009-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
deleted file mode 100644
index 295a348..0000000
--- a/debian/patches/0009-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Cole Robinson <crobinso at redhat.com>
-Date: Mon, 14 Jan 2013 15:06:14 -0500
-Subject: Don't fail if we can't set locale (debian bug #697864)
-
----
- virtinst/cli.py | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/virtinst/cli.py b/virtinst/cli.py
-index e0d8f21..0687b60 100644
---- a/virtinst/cli.py
-+++ b/virtinst/cli.py
-@@ -144,7 +144,13 @@ def setupParser(usage=None):
- return parser
-
- def setupGettext():
-- locale.setlocale(locale.LC_ALL, '')
-+ try:
-+ locale.setlocale(locale.LC_ALL, '')
-+ except locale.Error, e:
-+ print >> sys.stderr, "warning: failed to set locale, defaulting to C"
-+ os.environ['LC_ALL'] = 'C'
-+ locale.setlocale(locale.LC_ALL, 'C')
-+
- gettext.bindtextdomain("virtinst")
- gettext.install("virtinst")
-
diff --git a/debian/patches/series b/debian/patches/series
index e722955..c37158f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
0001-fix-path-to-hvmloader.patch
0002-Fix-path-to-pygrub.patch
0003-Fix-path-to-keyboard-configuration.patch
-0004-LogicalPool-properly-pass-on-autostart-flag.patch
-0005-Don-t-overwrite-target-element-for-disks-that-have-i.patch
-0006-virt-install-avoid-disk-name-collisions.patch
-0007-Don-t-fail-if-no-meter-is-used.patch
-0008-The-Debian-stable-release-always-exists.patch
-0009-Don-t-fail-if-we-can-t-set-locale-debian-bug-697864.patch
+0004-virt-install-avoid-disk-name-collisions.patch
+0005-Don-t-fail-if-no-meter-is-used.patch
--
Virtinst Debian packaging
More information about the Pkg-libvirt-commits
mailing list