| 1 |
Author: zmedico |
| 2 |
Date: 2008-09-26 15:00:03 +0000 (Fri, 26 Sep 2008) |
| 3 |
New Revision: 11558 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
Bug #238766 - Revert the fetch() mirror:// behavior change from r11537 since |
| 9 |
it wasn't actually needed to comply with PMS 9.2.8, and the change actuall |
| 10 |
caused incorrect mirror fetching behavior. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/portage/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/portage/__init__.py 2008-09-26 07:55:16 UTC (rev 11557) |
| 16 |
+++ main/trunk/pym/portage/__init__.py 2008-09-26 15:00:03 UTC (rev 11558) |
| 17 |
@@ -3508,13 +3508,7 @@ |
| 18 |
eidx = myuri.find("/", 9) |
| 19 |
if eidx != -1: |
| 20 |
mirrorname = myuri[9:eidx] |
| 21 |
- if myfile != os.path.basename(myuri): |
| 22 |
- # If a SRC_URI arrow is used together with |
| 23 |
- # mirror://, preserve the remote path that's |
| 24 |
- # specified within the uri. |
| 25 |
- path = myuri[eidx+1:] |
| 26 |
- else: |
| 27 |
- path = myfile |
| 28 |
+ path = myuri[eidx+1:] |
| 29 |
|
| 30 |
# Try user-defined mirrors first |
| 31 |
if mirrorname in custommirrors: |
Archives