| 1 |
commit: fe01dc23324660ae18c732cfacd458c3faf50ad7 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 23:32:50 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 23:32:50 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=fe01dc23 |
| 7 |
|
| 8 |
Join /var/log/emerge.log with EPREFIX. |
| 9 |
|
| 10 |
--- |
| 11 |
pym/_emerge/main.py | 11 ++++++++++- |
| 12 |
1 files changed, 10 insertions(+), 1 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py |
| 15 |
index b3e047c..b6b63e2 100644 |
| 16 |
--- a/pym/_emerge/main.py |
| 17 |
+++ b/pym/_emerge/main.py |
| 18 |
@@ -1786,7 +1786,11 @@ def emerge_main(args=None): |
| 19 |
if x in myopts: |
| 20 |
disable_emergelog = True |
| 21 |
break |
| 22 |
- if myaction in ("search", "info"): |
| 23 |
+ if disable_emergelog: |
| 24 |
+ pass |
| 25 |
+ elif myaction in ("search", "info"): |
| 26 |
+ disable_emergelog = True |
| 27 |
+ elif portage.data.secpass < 1: |
| 28 |
disable_emergelog = True |
| 29 |
|
| 30 |
_emerge.emergelog._disable = disable_emergelog |
| 31 |
@@ -1801,8 +1805,13 @@ def emerge_main(args=None): |
| 32 |
"EMERGE_LOG_DIR='%s':\n!!! %s\n" % \ |
| 33 |
(settings['EMERGE_LOG_DIR'], e), |
| 34 |
noiselevel=-1, level=logging.ERROR) |
| 35 |
+ portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) |
| 36 |
else: |
| 37 |
_emerge.emergelog._emerge_log_dir = settings["EMERGE_LOG_DIR"] |
| 38 |
+ else: |
| 39 |
+ _emerge.emergelog._emerge_log_dir = os.path.join(os.sep, |
| 40 |
+ settings["EPREFIX"].lstrip(os.sep), "var", "log") |
| 41 |
+ portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) |
| 42 |
|
| 43 |
if not "--pretend" in myopts: |
| 44 |
emergelog(xterm_titles, "Started emerge on: "+\ |
Archives