From a119a00ff4a0fd8b903fef340b796e5a65c1e1bc Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 28 Jun 2009 14:48:34 +0000 Subject: [PATCH] logging /inside/ the prefix is much more fun svn path=/main/branches/prefix/; revision=13722 --- pym/_emerge/Binpkg.py | 3 ++- pym/_emerge/EbuildBuild.py | 3 ++- pym/_emerge/emergelog.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 4e710fe75..9a11e0835 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -19,6 +19,7 @@ else: sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage from portage.output import colorize +from portage.const import EPREFIX class Binpkg(CompositeTask): __slots__ = ("find_blockers", @@ -82,7 +83,7 @@ class Binpkg(CompositeTask): waiting_msg = ("Fetching '%s' " + \ "in the background. " + \ "To view fetch progress, run `tail -f " + \ - "/var/log/emerge-fetch.log` in another " + \ + EPREFIX + "/var/log/emerge-fetch.log` in another " + \ "terminal.") % prefetcher.pkg_path msg_prefix = colorize("GOOD", " * ") from textwrap import wrap diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py index effa5fcfe..d7e769482 100644 --- a/pym/_emerge/EbuildBuild.py +++ b/pym/_emerge/EbuildBuild.py @@ -20,6 +20,7 @@ else: sys.path.insert(0, os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "pym")) import portage from portage.output import colorize +from portage.const import EPREFIX class EbuildBuild(CompositeTask): __slots__ = ("args_set", "config_pool", "find_blockers", @@ -53,7 +54,7 @@ class EbuildBuild(CompositeTask): waiting_msg = "Fetching files " + \ "in the background. " + \ "To view fetch progress, run `tail -f " + \ - "/var/log/emerge-fetch.log` in another " + \ + EPREFIX + "/var/log/emerge-fetch.log` in another " + \ "terminal." msg_prefix = colorize("GOOD", " * ") from textwrap import wrap diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py index f8b537ced..4c8f54719 100644 --- a/pym/_emerge/emergelog.py +++ b/pym/_emerge/emergelog.py @@ -16,8 +16,9 @@ import portage from portage.data import secpass from portage.output import xtermTitle +from portage.const import EPREFIX -_emerge_log_dir = '/var/log' +_emerge_log_dir = EPREFIX + '/var/log' def emergelog(xterm_titles, mystr, short_msg=None): if xterm_titles and short_msg: -- 2.26.2