From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A908E13838B for ; Sat, 13 Sep 2014 05:55:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10CC1E07B2; Sat, 13 Sep 2014 05:55:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AFF0DE07B2 for ; Sat, 13 Sep 2014 05:55:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76FB733FB4C for ; Sat, 13 Sep 2014 05:55:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30C855560 for ; Sat, 13 Sep 2014 05:55:50 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1410587583.e7eca8a5ec2ec4e7dd03b1b5afb05647e199a687.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Binpkg.py pym/_emerge/EbuildBuild.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e7eca8a5ec2ec4e7dd03b1b5afb05647e199a687 X-VCS-Branch: master Date: Sat, 13 Sep 2014 05:55:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 30423580-40ab-4872-877f-247e8a4ba478 X-Archives-Hash: ff9500200cda92f3c3c087304edff3c4 commit: e7eca8a5ec2ec4e7dd03b1b5afb05647e199a687 Author: Brian Dolbec gentoo org> AuthorDate: Fri Sep 12 00:04:17 2014 +0000 Commit: Brian Dolbec gmail 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) \