|
Lines 2534-2542
def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
Link Here
|
| 2534 |
else: |
2534 |
else: |
| 2535 |
resumecommand=mysettings["RESUMECOMMAND"] |
2535 |
resumecommand=mysettings["RESUMECOMMAND"] |
| 2536 |
|
2536 |
|
| 2537 |
fetchcommand=fetchcommand.replace("${DISTDIR}",mysettings["DISTDIR"]) |
|
|
| 2538 |
resumecommand=resumecommand.replace("${DISTDIR}",mysettings["DISTDIR"]) |
| 2539 |
|
| 2540 |
if not can_fetch: |
2537 |
if not can_fetch: |
| 2541 |
if fetched != 2: |
2538 |
if fetched != 2: |
| 2542 |
if fetched == 0: |
2539 |
if fetched == 0: |
|
Lines 2566-2573
def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
Link Here
|
| 2566 |
locfetch=fetchcommand |
2563 |
locfetch=fetchcommand |
| 2567 |
writemsg_stdout(">>> Downloading '%s'\n" % \ |
2564 |
writemsg_stdout(">>> Downloading '%s'\n" % \ |
| 2568 |
re.sub(r'//(.+):.+@(.+)/',r'//\1:*password*@\2/', loc)) |
2565 |
re.sub(r'//(.+):.+@(.+)/',r'//\1:*password*@\2/', loc)) |
| 2569 |
myfetch=locfetch.replace("${URI}",loc) |
2566 |
myfetch = locfetch.split() |
| 2570 |
myfetch=myfetch.replace("${FILE}",myfile) |
2567 |
variables = {"${DISTDIR}":mysettings["DISTDIR"], |
|
|
2568 |
"${URI}":loc, "${FILE}":myfile} |
| 2569 |
for i in xrange(len(myfetch)): |
| 2570 |
token = myfetch[i].strip("\"'") |
| 2571 |
value = variables.get(token) |
| 2572 |
if value is not None: |
| 2573 |
myfetch[i] = value |
| 2571 |
|
2574 |
|
| 2572 |
spawn_keywords = {} |
2575 |
spawn_keywords = {} |
| 2573 |
if "userfetch" in mysettings.features and \ |
2576 |
if "userfetch" in mysettings.features and \ |
|
Lines 2585-2591
def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
Link Here
|
| 2585 |
con = con.replace(mysettings["PORTAGE_T"], mysettings["PORTAGE_FETCH_T"]) |
2588 |
con = con.replace(mysettings["PORTAGE_T"], mysettings["PORTAGE_FETCH_T"]) |
| 2586 |
selinux.setexec(con) |
2589 |
selinux.setexec(con) |
| 2587 |
|
2590 |
|
| 2588 |
myret = portage_exec.spawn_bash(myfetch, |
2591 |
myret = portage_exec.spawn(myfetch, |
| 2589 |
env=mysettings.environ(), **spawn_keywords) |
2592 |
env=mysettings.environ(), **spawn_keywords) |
| 2590 |
|
2593 |
|
| 2591 |
if mysettings.selinux_enabled(): |
2594 |
if mysettings.selinux_enabled(): |
