summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-11-11 23:26:27 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-11-11 23:26:27 +0000
commitfbe20241d187ac38f2bde7e00b6d71a21b558e99 (patch)
treef2adc2d9f54219778104e2c03ab9c6eeab7ecc5e
parent9e503cc62b11b76609c99698bb50d53351b36143 (diff)
downloadbcfg2-fbe20241d187ac38f2bde7e00b6d71a21b558e99.tar.gz
bcfg2-fbe20241d187ac38f2bde7e00b6d71a21b558e99.tar.bz2
bcfg2-fbe20241d187ac38f2bde7e00b6d71a21b558e99.zip
Packages: create urls that work with old urllib2 (Resolves ticket #796) [bugfix]
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5572 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Packages.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/Packages.py b/src/lib/Server/Plugins/Packages.py
index 948d44fec..a60788b16 100644
--- a/src/lib/Server/Plugins/Packages.py
+++ b/src/lib/Server/Plugins/Packages.py
@@ -379,6 +379,7 @@ class APTSource(Source):
Source.__init__(self, basepath, url, version, arches, components, groups, rawurl)
self.cachefile = self.escape_url(self.url) + '.data'
self.pkgnames = set()
+ print self.url
def save_state(self):
cache = file(self.cachefile, 'wb')
@@ -391,7 +392,7 @@ class APTSource(Source):
self.pkgnames, self.deps, self.provides = cPickle.load(data)
def get_urls(self):
- return ["%s/dists/%s/%s/binary-%s/Packages.gz" % \
+ return ["%sdists/%s/%s/binary-%s/Packages.gz" % \
(self.url, self.version, part, arch) for part in self.components \
for arch in self.arches]
urls = property(get_urls)