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 82861138BEF for ; Sun, 11 Oct 2015 06:29:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A3A3E07E1; Sun, 11 Oct 2015 06:29:19 +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 0D0AAE07C9 for ; Sun, 11 Oct 2015 06:29:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 2137834063E for ; Sun, 11 Oct 2015 06:29:16 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 02/10] stage2: convert to log module Date: Sun, 11 Oct 2015 02:29:04 -0400 Message-Id: <1444544952-32408-2-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1444544952-32408-1-git-send-email-vapier@gentoo.org> References: <1444544952-32408-1-git-send-email-vapier@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: c1401777-0cf3-42f3-9bb1-9cfe19c28fe2 X-Archives-Hash: 91f95c71497c800c3a607cbae76d54c6 --- 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.") -- 2.5.2