[Pkg-libvirt-commits] [SCM] Virtinst Debian packaging branch, master, updated. debian/0.600.1-2

[Guido Günther]

The following commit has been merged in the master branch:
commit 5e594010cd7122a5bd1c9bbd41aa37bdd2d51ee2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Mon Apr 16 14:23:21 2012 +0200

    Fix location of Debian daily builds
    
    Thanks: Gaudenz Steinlin
    Closes: #668627

diff --git a/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch b/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch
new file mode 100644
index 0000000..2a28c3b
--- /dev/null
+++ b/debian/patches/0004-Fix-location-of-Debian-daily-builds.patch
@@ -0,0 +1,53 @@
+From: Gaudenz Steinlin <gaudenz at debian.org>
+Date: Mon, 16 Apr 2012 13:54:23 +0200
+Subject: Fix location of Debian daily builds
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When selecting a distribution tree over http as an installation source
+the URL for Debian daily builds is not recognized because the layout
+changed. Daily builds are no longer hosted on joeyhs p.d.o site but on
+d-i.debian.org.
+
+Signed-off-by: Guido Günther <agx at sigxcpu.org>
+---
+ virtinst/OSDistro.py |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/virtinst/OSDistro.py b/virtinst/OSDistro.py
+index f30e6e4..69be4af 100644
+--- a/virtinst/OSDistro.py
++++ b/virtinst/OSDistro.py
+@@ -889,16 +889,16 @@ class SuseDistro(Distro):
+ 
+ class DebianDistro(Distro):
+     # ex. http://ftp.egr.msu.edu/debian/dists/sarge/main/installer-i386/
+-    # daily builds: http://people.debian.org/~joeyh/d-i/
++    # daily builds: http://d-i.debian.org/daily-images/amd64/ 
+ 
+     name = "Debian"
+     os_type = "linux"
+ 
+     def __init__(self, uri, arch, vmtype=None, scratchdir=None):
+         Distro.__init__(self, uri, arch, vmtype, scratchdir)
+-        if uri.count("installer-i386"):
++        if uri.count("i386"):
+             self._treeArch = "i386"
+-        elif uri.count("installer-amd64"):
++        elif uri.count("amd64"):
+             self._treeArch = "amd64"
+         else:
+             self._treeArch = "i386"
+@@ -925,9 +925,9 @@ class DebianDistro(Distro):
+         if fetcher.hasFile("%s/MANIFEST" % self._prefix):
+             # For regular trees
+             pass
+-        elif fetcher.hasFile("images/daily/MANIFEST"):
++        elif fetcher.hasFile("daily/MANIFEST"):
+             # For daily trees
+-            self._prefix = "images/daily"
++            self._prefix = "daily"
+             self._set_media_paths()
+         else:
+             return False
diff --git a/debian/patches/series b/debian/patches/series
index 3419750..0054232 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-fix-path-to-hvmloader.patch
 0002-Fix-path-to-pygrub.patch
 0003-Fix-path-to-keyboard-configuration.patch
+0004-Fix-location-of-Debian-daily-builds.patch

-- 
Virtinst Debian packaging