diff options
Diffstat (limited to 'yum-presto/shared/prestoRepo.py')
| -rw-r--r-- | yum-presto/shared/prestoRepo.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/yum-presto/shared/prestoRepo.py b/yum-presto/shared/prestoRepo.py index 582dc2f..bc1b188 100644 --- a/yum-presto/shared/prestoRepo.py +++ b/yum-presto/shared/prestoRepo.py @@ -49,7 +49,7 @@ class PrestoRepository(Repository): self.baseurl = [conduit.confString(repo.id, 'deltaurl')] is_different = True conduit.info(5, 'Manual url set from presto.conf: %s' % self.baseurl) - elif repo.deltaurl != []: + elif repo.deltaurl != [] and repo.deltaurl != None: self.baseurl = repo.deltaurl is_different = True conduit.info(5, 'Manual url set from repository conf file: %s' % self.baseurl) @@ -368,9 +368,12 @@ class PrestoRepository(Repository): return result def getPackage(self, package, checkfunc = None, text = None, cache = True): - remote = package.returnSimple('relativepath') - local = package.localPkg() - basepath = package.returnSimple('basepath') + remote = package.deltarelativepath + local = package.deltalocalpath + if hasattr(package, 'basepath'): + basepath = package.basepath + else: + basepath = package.returnSimple('basepath') return self.__get(url=basepath, relative=remote, |