From 189267fd90029f2ed796c3d7faf3153944cf6158 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 26 Sep 2008 15:00:03 +0000 Subject: Bug #238766 - Revert the fetch() mirror:// behavior change from r11537 since it wasn't actually needed to comply with PMS 9.2.8, and the change actuall caused incorrect mirror fetching behavior. svn path=/main/trunk/; revision=11558 --- pym/portage/__init__.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 529bb5274..cfeb8942e 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -3508,13 +3508,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks", eidx = myuri.find("/", 9) if eidx != -1: mirrorname = myuri[9:eidx] - if myfile != os.path.basename(myuri): - # If a SRC_URI arrow is used together with - # mirror://, preserve the remote path that's - # specified within the uri. - path = myuri[eidx+1:] - else: - path = myfile + path = myuri[eidx+1:] # Try user-defined mirrors first if mirrorname in custommirrors: -- cgit v1.2.3-1-g7c22