From 2286d42ec0fd630eda45c2b1dbb867b98be76668 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 6 Oct 2009 05:45:55 +0000 Subject: When restarting emerge, don't trust sys.argv[0] since eselect-python may modify it. svn path=/main/trunk/; revision=14499 --- pym/_emerge/Scheduler.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym') diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index b6f08307d..e1eb2672f 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -753,7 +753,9 @@ class Scheduler(PollScheduler): mtimedb["resume"]["mergelist"].remove(list(pkg)) mtimedb.commit() portage.run_exitfuncs() - mynewargv = [sys.argv[0], "--resume"] + # Don't trust sys.argv[0] here because eselect-python may modify it. + emerge_binary = os.path.join(portage.const.PORTAGE_BIN_PATH, 'emerge') + mynewargv = [emerge_binary, "--resume"] resume_opts = self.myopts.copy() # For automatic resume, we need to prevent # any of bad_resume_opts from leaking in -- cgit v1.2.3-1-g7c22