diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-09-03 16:32:50 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-09-03 16:32:50 -0700 |
| commit | fe01dc23324660ae18c732cfacd458c3faf50ad7 (patch) | |
| tree | 79e97003fadcf39fb100d7dc88259dc578056807 | |
| parent | b449f5df29848097b12e161df5d50ceed03a0517 (diff) | |
| download | portage-fe01dc23324660ae18c732cfacd458c3faf50ad7.tar.gz portage-fe01dc23324660ae18c732cfacd458c3faf50ad7.tar.bz2 portage-fe01dc23324660ae18c732cfacd458c3faf50ad7.zip | |
Join /var/log/emerge.log with EPREFIX.
| -rw-r--r-- | pym/_emerge/main.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py index b3e047c9d..b6b63e2fd 100644 --- a/pym/_emerge/main.py +++ b/pym/_emerge/main.py @@ -1786,7 +1786,11 @@ def emerge_main(args=None): if x in myopts: disable_emergelog = True break - if myaction in ("search", "info"): + if disable_emergelog: + pass + elif myaction in ("search", "info"): + disable_emergelog = True + elif portage.data.secpass < 1: disable_emergelog = True _emerge.emergelog._disable = disable_emergelog @@ -1801,8 +1805,13 @@ def emerge_main(args=None): "EMERGE_LOG_DIR='%s':\n!!! %s\n" % \ (settings['EMERGE_LOG_DIR'], e), noiselevel=-1, level=logging.ERROR) + portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) else: _emerge.emergelog._emerge_log_dir = settings["EMERGE_LOG_DIR"] + else: + _emerge.emergelog._emerge_log_dir = os.path.join(os.sep, + settings["EPREFIX"].lstrip(os.sep), "var", "log") + portage.util.ensure_dirs(_emerge.emergelog._emerge_log_dir) if not "--pretend" in myopts: emergelog(xterm_titles, "Started emerge on: "+\ |