From 716502c6d282a17ce63333cff14fc9b7ac1f0316 Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Fri, 23 Mar 2007 15:03:10 +0200 Subject: - Fixed bug in handling mirrorlists in original repositories - Added Changelog Signed-off-by: Jonathan Dieter --- Changelog | 5 +++++ shared/prestoRepo.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 Changelog diff --git a/Changelog b/Changelog new file mode 100644 index 0000000..83c8d81 --- /dev/null +++ b/Changelog @@ -0,0 +1,5 @@ +* Fri Mar 23 2007 Jonathan Dieter - 0.2.1 +- Fixed bug in handling mirrorlists in original repositories + +* Thu Mar 22 2007 Jonathan Dieter - 0.2.0 +- Initial release diff --git a/shared/prestoRepo.py b/shared/prestoRepo.py index 1daf5ac..6ad4b99 100644 --- a/shared/prestoRepo.py +++ b/shared/prestoRepo.py @@ -59,14 +59,19 @@ class PrestoRepository(Repository): # If there's a specific mirrorlist, use that if conduit.confString(repo.id, 'deltamirrorlist'): self.mirrorlist = conduit.confString(repo.id, 'deltamirrorlist') + self.baseurl = None is_different = True conduit.info(5, 'Manual mirrorlist set from presto.conf: %s' % self.mirrorlist) elif repo.deltamirrorlist != None: self.mirrorlist = repo.deltamirrorlist + self.baseurl = None is_different = True conduit.info(5, 'Manual mirrorlist set from repository conf file: %s' % self.mirrorlist) else: - self.mirrorlist = repo.mirrorlist + if self.baseurl == repo.baseurl: + self.mirrorlist = repo.mirrorlist + else: + self.mirrorlist = None self.conduit = conduit self.urls = [] -- cgit