commit: 2809b7cfcb889bbc76a61fdbce7d58599aa36c56
Author: Pavel Kazakov <nullishzero <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 21 19:31:17 2015 +0000
Commit: Pavel Kazakov <nullishzero <AT> gentoo <DOT> org>
CommitDate: Sat Feb 21 19:31:17 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2809b7cf
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.
---
pym/portage/emaint/modules/merges/merges.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pym/portage/emaint/modules/merges/merges.py
b/pym/portage/emaint/modules/merges/merges.py
index 7146c76..8f677c2 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'
