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 C961E13888F for ; Sun, 11 Oct 2015 17:26:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25D69E07F7; Sun, 11 Oct 2015 17:26:41 +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 7D004E07F2 for ; Sun, 11 Oct 2015 17:26:40 +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 3B1F233BF11 for ; Sun, 11 Oct 2015 17:26:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B5AADF3 for ; Sun, 11 Oct 2015 17:26:37 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1444521276.fddd40039ce4d608dfc793a1ef8a60ca40413dc4.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: fddd40039ce4d608dfc793a1ef8a60ca40413dc4 X-VCS-Branch: master Date: Sun, 11 Oct 2015 17:26:37 +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: 233f6bfe-3c77-47e5-85ae-1b6cc909217d X-Archives-Hash: 9494dbb742e86feca6d2c6dee67f187d commit: fddd40039ce4d608dfc793a1ef8a60ca40413dc4 Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 10 05:11:44 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sat Oct 10 23:54:36 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=fddd4003 stage2: convert to log module catalyst/targets/stage2.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/catalyst/targets/stage2.py b/catalyst/targets/stage2.py index 786aaa4..ff060d2 100644 --- a/catalyst/targets/stage2.py +++ b/catalyst/targets/stage2.py @@ -5,6 +5,7 @@ stage2 target, builds upon previous stage1 tarball import os +from catalyst import log from catalyst.support import normpath from catalyst.base.stagebase import StageBase @@ -30,10 +31,12 @@ class stage2(StageBase): self.settings["hash_map"].generate_hash( self.settings["source_path"],\ hash_=self.settings["hash_function"]) - print "Source path set to "+self.settings["source_path"] + log.notice('Source path set to %s', self.settings['source_path']) if os.path.isdir(self.settings["source_path"]): - print "\tIf this is not desired, remove this directory or turn off seedcache in the options of catalyst.conf" - print "\tthe source path will then be "+normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"] + "\n") + log.warning( + 'If this is not desired, remove this directory or turn off seedcache in the\n' + 'options of catalyst.conf. The source path will then be:\n%s', + normpath(self.settings['storedir'] + '/builds/' + self.settings['source_subpath'])) # XXX: How do these override_foo() functions differ from the ones in # StageBase and why aren't they in stage3_target? @@ -57,7 +60,7 @@ class stage2(StageBase): def set_portage_overlay(self): StageBase.set_portage_overlay(self) if "portage_overlay" in self.settings: - print "\nWARNING !!!!!" - print "\tUsing an portage overlay for earlier stages could cause build issues." - print "\tIf you break it, you buy it. Don't complain to us about it." - print "\tDont say we did not warn you\n" + log.warning( + 'Using an overlay for earlier stages could cause build issues.\n' + "If you break it, you buy it. Don't complain to us about it.\n" + "Don't say we did not warn you.")