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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 529bb52746076da06959d8db5bda1f2577518166..cfeb8942e0e1c97ab3be522fd4d7c4911fd58540 100644 (file)
--- 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: