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 B194913888F for ; Sun, 11 Oct 2015 17:26:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6ABDE0857; Sun, 11 Oct 2015 17:26:42 +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 AD784E0857 for ; Sun, 11 Oct 2015 17:26:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F3AFC33E3A9 for ; Sun, 11 Oct 2015 17:26:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4424DF8 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: <1444542969.9cbedb5c8c8e2158e5e21e3038a0651cd4fe66e9.vapier@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/targets/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/targets/livecd_stage1.py catalyst/targets/livecd_stage2.py X-VCS-Directories: catalyst/targets/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 9cbedb5c8c8e2158e5e21e3038a0651cd4fe66e9 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: 18dfdfb5-77c0-4fcd-9a3e-eeaaa9fbf8e8 X-Archives-Hash: 29ef6abafc009c9241c77e5bd38a2cdf commit: 9cbedb5c8c8e2158e5e21e3038a0651cd4fe66e9 Author: Mike Frysinger gentoo org> AuthorDate: Sat Oct 10 05:28:45 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Oct 11 05:56:09 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9cbedb5c livecd_stage: convert to log module catalyst/targets/livecd_stage1.py | 4 ++-- catalyst/targets/livecd_stage2.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py index 262db70..8d9dcc7 100644 --- a/catalyst/targets/livecd_stage1.py +++ b/catalyst/targets/livecd_stage1.py @@ -6,7 +6,7 @@ LiveCD stage1 target import os import types - +from catalyst import log from catalyst.support import (normpath, cmd) from catalyst.fileops import ensure_dirs @@ -34,7 +34,7 @@ class livecd_stage1(StageBase): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("setup_target_path"): - print "Resume point detected, skipping target path setup operation..." + log.notice('Resume point detected, skipping target path setup operation...') else: # first clean up any existing target stuff if os.path.exists(self.settings["target_path"]): diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py index b54f2f0..fa76421 100644 --- a/catalyst/targets/livecd_stage2.py +++ b/catalyst/targets/livecd_stage2.py @@ -5,6 +5,7 @@ LiveCD stage2 target, builds upon previous LiveCD stage1 tarball import os +from catalyst import log from catalyst.support import (normpath, file_locate, CatalystError, cmd) from catalyst.fileops import ensure_dirs from catalyst.base.stagebase import StageBase @@ -55,7 +56,7 @@ class livecd_stage2(StageBase): self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) if "autoresume" in self.settings["options"] \ and self.resume.is_enabled("setup_target_path"): - print "Resume point detected, skipping target path setup operation..." + log.notice('Resume point detected, skipping target path setup operation...') else: # first clean up any existing target stuff if os.path.isdir(self.settings["target_path"]):