Hi Cole,
On Mon, Apr 16, 2012 at 07:28:22AM -0400, Cole Robinson wrote:
> On 04/13/2012 11:59 AM, Gaudenz Steinlin wrote:
> > 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.
> >
>
> Patch looks good to me. Guido, if it looks good to you I'll apply it upstream.
Patch looks good. I've attached a version against current git.
Cheers,
-- Guido
>From b576e42ca81e579f9253e3781ebc5200575221a6 Mon Sep 17 00:00:00 2001
From: Gaudenz Steinlin <gaud...@debian.org>
Date: Mon, 16 Apr 2012 13:54:23 +0200
Subject: [PATCH] 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 <a...@sigxcpu.org>
---
virtinst/OSDistro.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/virtinst/OSDistro.py b/virtinst/OSDistro.py
index eecfbee..e92dd8c 100644
--- a/virtinst/OSDistro.py
+++ b/virtinst/OSDistro.py
@@ -899,16 +899,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"
@@ -935,9 +935,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
--
1.7.10
