diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2005-08-31 21:37:18 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2005-08-31 21:37:18 +0000 |
| commit | 64142298580e83b51845f016469e881b3a2538b2 (patch) | |
| tree | 1a2a3bf45d5b22bb4285a33163ce3ab5d9dccca4 | |
| parent | 6012386e61cedda17d982e2ac9f7ae494671a57c (diff) | |
| download | bcfg2-64142298580e83b51845f016469e881b3a2538b2.tar.gz bcfg2-64142298580e83b51845f016469e881b3a2538b2.tar.bz2 bcfg2-64142298580e83b51845f016469e881b3a2538b2.zip | |
simplefile fix
(Logical change 1.291)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1160 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Server/Generators/Pkgmgr.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Generators/Pkgmgr.py b/src/lib/Server/Generators/Pkgmgr.py index ae82dc5d1..eb648d2f8 100644 --- a/src/lib/Server/Generators/Pkgmgr.py +++ b/src/lib/Server/Generators/Pkgmgr.py @@ -21,7 +21,7 @@ class PackageEntry(XMLFileBacked): if pkg.attrib.has_key("simplefile"): self.packages[pkg.get('name')] = deepcopy(pkg.attrib) # most attribs will be set from pkg - self.packages[pkg.get('name')]['uri'] = location.attrib['uri'] + self.packages[pkg.get('name')]['uri'] = "%s/%s" % (location.get('uri'), pkg.get('simplefile')) elif pkg.attrib.has_key("file"): mdata = self.rpm.match(pkg.get('file')) if not mdata: @@ -29,8 +29,8 @@ class PackageEntry(XMLFileBacked): continue pkgname = mdata.group('name') self.packages[pkgname] = mdata.groupdict() - self.packages[pkgname]['file'] = pkg.attrib['file'] - self.packages[pkgname]['uri'] = location.attrib['uri'] + self.packages[pkgname]['file'] = pkg.get('file') + self.packages[pkgname]['uri'] = location.get('uri') self.packages[pkgname]['type'] = 'rpm' else: self.packages[pkg.get('name')] = pkg.attrib |