| 1 |
Due to a change to the constant PORTAGE_BIN_PATH, the emaint merges |
| 2 |
module needs to be updated to properly call the emerge command. |
| 3 |
Furthermore, the --ask flag is set to prompt users before attempting |
| 4 |
to emerge any packages--thanks to Nikoli for the idea. |
| 5 |
--- |
| 6 |
pym/portage/emaint/modules/merges/merges.py | 6 +++--- |
| 7 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 8 |
|
| 9 |
diff --git a/pym/portage/emaint/modules/merges/merges.py b/pym/portage/emaint/modules/merges/merges.py |
| 10 |
index 7146c76..8f677c2 100644 |
| 11 |
--- a/pym/portage/emaint/modules/merges/merges.py |
| 12 |
+++ b/pym/portage/emaint/modules/merges/merges.py |
| 13 |
@@ -3,8 +3,7 @@ |
| 14 |
|
| 15 |
import portage |
| 16 |
from portage import os, _unicode_encode |
| 17 |
-from portage.const import MERGING_IDENTIFIER, PORTAGE_BIN_PATH, PRIVATE_PATH, \ |
| 18 |
- VDB_PATH |
| 19 |
+from portage.const import MERGING_IDENTIFIER, EPREFIX, PRIVATE_PATH, VDB_PATH |
| 20 |
from portage.dep import isvalidatom |
| 21 |
|
| 22 |
import shutil |
| 23 |
@@ -206,7 +205,8 @@ class MergesHandler(object): |
| 24 |
emerge_cmd = ( |
| 25 |
portage._python_interpreter, |
| 26 |
'-b', |
| 27 |
- os.path.join(PORTAGE_BIN_PATH, 'emerge'), |
| 28 |
+ os.path.join(EPREFIX or '/', 'usr', 'bin', 'emerge'), |
| 29 |
+ '--ask', |
| 30 |
'--quiet', |
| 31 |
'--oneshot', |
| 32 |
'--complete-graph=y' |
| 33 |
-- |
| 34 |
2.0.5 |
Archives