aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Kazakov <nullishzero@gentoo.org>2015-02-21 11:31:17 -0800
committerPavel Kazakov <nullishzero@gentoo.org>2015-02-21 11:31:17 -0800
commit2809b7cfcb889bbc76a61fdbce7d58599aa36c56 (patch)
tree9d9e7cca03e41eb00929363d7b4922a48f25a8cb
parentemerge(1): use (...) for parenthetical asides (diff)
downloadportage-2809b7cfcb889bbc76a61fdbce7d58599aa36c56.tar.gz
portage-2809b7cfcb889bbc76a61fdbce7d58599aa36c56.tar.bz2
portage-2809b7cfcb889bbc76a61fdbce7d58599aa36c56.zip
emaint merges: Fix call to emerge
Due to a change to the constant PORTAGE_BIN_PATH, the emaint merges module needs to be updated to properly call the emerge command. Furthermore, the --ask flag is set to prompt users before attempting to emerge any packages--thanks to Nikoli for the idea.
-rw-r--r--pym/portage/emaint/modules/merges/merges.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/pym/portage/emaint/modules/merges/merges.py b/pym/portage/emaint/modules/merges/merges.py
index 7146c76cd..8f677c2a8 100644
--- a/pym/portage/emaint/modules/merges/merges.py
+++ b/pym/portage/emaint/modules/merges/merges.py
@@ -3,8 +3,7 @@
import portage
from portage import os, _unicode_encode
-from portage.const import MERGING_IDENTIFIER, PORTAGE_BIN_PATH, PRIVATE_PATH, \
- VDB_PATH
+from portage.const import MERGING_IDENTIFIER, EPREFIX, PRIVATE_PATH, VDB_PATH
from portage.dep import isvalidatom
import shutil
@@ -206,7 +205,8 @@ class MergesHandler(object):
emerge_cmd = (
portage._python_interpreter,
'-b',
- os.path.join(PORTAGE_BIN_PATH, 'emerge'),
+ os.path.join(EPREFIX or '/', 'usr', 'bin', 'emerge'),
+ '--ask',
'--quiet',
'--oneshot',
'--complete-graph=y'