Package: virtinst
Version: 0.600.1-1
Severity: normal
Tags: patch

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.

The attached patch fixes the detection of the URL scheme.

Gaudenz

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (800, 'testing'), (700, 'unstable'), (50, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-2-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_CH.UTF-8, LC_CTYPE=de_CH.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages virtinst depends on:
ii  python             2.7.2-10
ii  python-libvirt     0.9.9-3+b2
ii  python-libxml2     2.7.8.dfsg-7
ii  python-support     1.0.14
ii  python-urlgrabber  3.9.1-4

Versions of packages virtinst recommends:
ii  qemu         1.0.1+dfsg-1
ii  virt-viewer  0.5.1-1

virtinst suggests no packages.

-- no debconf information
--- /usr/share/pyshared/virtinst/OSDistro.py	2012-02-02 12:12:41.000000000 +0100
+++ OSDistro.py	2012-04-13 17:51:00.806997815 +0200
@@ -889,16 +889,16 @@
 
 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 @@
         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

Reply via email to