logging /inside/ the prefix is much more fun

svn path=/main/branches/prefix/; revision=13722

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 4e710fe7548155ff4017f6dc275f557a3e728b93..9a11e0835d9a43ea682719582d62170d48448146 100644 (file)
--- 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 effa5fcfe68516f0e7e350c5aeed4e521389c95d..d7e769482ac4578443034a6563d6945e54226cd2 100644 (file)
--- 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 f8b537cede0a757b5c1ea91d140f4ca3e845cea2..4c8f5471932948d924dbc9891713c74452b171b8 100644 (file)
--- 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: