summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-09-26 15:00:03 +0000
committerZac Medico <zmedico@gentoo.org>2008-09-26 15:00:03 +0000
commit189267fd90029f2ed796c3d7faf3153944cf6158 (patch)
tree2a3701090940a94e9fa9d8f7617b60fbb4990d64
parent6a97ca3bfaa4621d00bb337a20af7c821dd09eee (diff)
downloadportage-189267fd90029f2ed796c3d7faf3153944cf6158.tar.gz
portage-189267fd90029f2ed796c3d7faf3153944cf6158.tar.bz2
portage-189267fd90029f2ed796c3d7faf3153944cf6158.zip
Bug #238766 - Revert the fetch() mirror:// behavior change from r11537 sincev2.2_rc11
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
-rw-r--r--pym/portage/__init__.py8
1 files changed, 1 insertions, 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: