| 1 |
Author: zmedico |
| 2 |
Date: 2009-10-06 05:45:55 +0000 (Tue, 06 Oct 2009) |
| 3 |
New Revision: 14499 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/Scheduler.py |
| 7 |
Log: |
| 8 |
When restarting emerge, don't trust sys.argv[0] since eselect-python may |
| 9 |
modify it. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/Scheduler.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/Scheduler.py 2009-10-05 22:51:26 UTC (rev 14498) |
| 15 |
+++ main/trunk/pym/_emerge/Scheduler.py 2009-10-06 05:45:55 UTC (rev 14499) |
| 16 |
@@ -753,7 +753,9 @@ |
| 17 |
mtimedb["resume"]["mergelist"].remove(list(pkg)) |
| 18 |
mtimedb.commit() |
| 19 |
portage.run_exitfuncs() |
| 20 |
- mynewargv = [sys.argv[0], "--resume"] |
| 21 |
+ # Don't trust sys.argv[0] here because eselect-python may modify it. |
| 22 |
+ emerge_binary = os.path.join(portage.const.PORTAGE_BIN_PATH, 'emerge') |
| 23 |
+ mynewargv = [emerge_binary, "--resume"] |
| 24 |
resume_opts = self.myopts.copy() |
| 25 |
# For automatic resume, we need to prevent |
| 26 |
# any of bad_resume_opts from leaking in |
Archives