[gentoo-commits] proj/portage:master commit in: pym/_emerge/

[Brian Dolbec]

commit:     e7eca8a5ec2ec4e7dd03b1b5afb05647e199a687
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 12 00:04:17 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Sep 13 05:53:03 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=e7eca8a5

_emerge: Fix hard-coded emerge-fetch.log locations Bug 520378

Use emergelog._emerge_log_dir instead of the hard-coded paths.

---
 pym/_emerge/Binpkg.py      | 6 +++---
 pym/_emerge/EbuildBuild.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index c0f0951..6978fb3 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -1,6 +1,7 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import _emerge.emergelog
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.BinpkgFetcher import BinpkgFetcher
 from _emerge.BinpkgEnvExtractor import BinpkgEnvExtractor
@@ -87,9 +88,8 @@ class Binpkg(CompositeTask):
 
                        waiting_msg = ("Fetching '%s' " + \
                                "in the background. " + \
-                               "To view fetch progress, run `tail -f %s" + \
-                               "/var/log/emerge-fetch.log` in another " + \
-                               "terminal.") % (prefetcher.pkg_path, 
settings["EPREFIX"])
+                               "To view fetch progress, run `tail -f %s` in 
another terminal.") \
+                               % (prefetcher.pkg_path, 
_emerge.emergelog._emerge_log_dir)
                        msg_prefix = colorize("GOOD", " * ")
                        waiting_msg = "".join("%s%s\n" % (msg_prefix, line) \
                                for line in textwrap.wrap(waiting_msg, 65))

diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index 86a5631..7bd10aa 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -1,6 +1,7 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+import _emerge.emergelog
 from _emerge.EbuildExecuter import EbuildExecuter
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.EbuildBinpkg import EbuildBinpkg
@@ -74,9 +75,8 @@ class EbuildBuild(CompositeTask):
 
                        waiting_msg = "Fetching files " + \
                                "in the background. " + \
-                               "To view fetch progress, run `tail -f " + \
-                               "/var/log/emerge-fetch.log` in another " + \
-                               "terminal."
+                               "To view fetch progress, run `tail -f %s` in 
another terminal." \
+                               % (_emerge.emergelog._emerge_log_dir)
                        msg_prefix = colorize("GOOD", " * ")
                        from textwrap import wrap
                        waiting_msg = "".join("%s%s\n" % (msg_prefix, line) \