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 BE64D13888F for ; Sun, 11 Oct 2015 06:29:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 079FE21C01B; Sun, 11 Oct 2015 06:29:21 +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 8690721C008 for ; Sun, 11 Oct 2015 06:29:19 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id CB213340666 for ; Sun, 11 Oct 2015 06:29:18 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 09/10] embedded/grp: convert to log module Date: Sun, 11 Oct 2015 02:29:11 -0400 Message-Id: <1444544952-32408-9-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: 6435876a-a06f-4ba8-883d-8054092823a9 X-Archives-Hash: abf02d05660075e6b41cdac288e86c97 --- catalyst/targets/embedded.py | 7 +++---- catalyst/targets/grp.py | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 6044e17..e441757 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -10,9 +10,8 @@ ROOT=/tmp/submerge emerge --something foo bar . """ # NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. - +from catalyst import log from catalyst.support import normpath - from catalyst.base.stagebase import StageBase class embedded(StageBase): @@ -39,8 +38,8 @@ class embedded(StageBase): def set_stage_path(self): self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot") - print "embedded stage path is "+self.settings["stage_path"] + log.info('embedded stage path is %s', self.settings['stage_path']) def set_root_path(self): self.settings["root_path"]=normpath("/tmp/mergeroot") - print "embedded root path is "+self.settings["root_path"] + log.info('embedded root path is %s', self.settings['root_path']) diff --git a/catalyst/targets/grp.py b/catalyst/targets/grp.py index 4814ac6..b37366c 100644 --- a/catalyst/targets/grp.py +++ b/catalyst/targets/grp.py @@ -7,7 +7,7 @@ import os import types import glob - +from catalyst import log from catalyst.support import (CatalystError, normpath, cmd, list_bashify) from catalyst.fileops import ensure_dirs from catalyst.base.stagebase import StageBase @@ -44,7 +44,7 @@ class grp(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"]): @@ -82,7 +82,7 @@ class grp(StageBase): for pkgset in self.settings["grp"]: if self.settings["grp/"+pkgset+"/type"] == "pkgset": destdir=normpath(self.settings["target_path"]+"/"+pkgset+"/All") - print "Digesting files in the pkgset....." + log.notice('Digesting files in the pkgset...') digests=glob.glob(destdir+'/*.DIGESTS') for i in digests: if os.path.exists(i): @@ -97,7 +97,7 @@ class grp(StageBase): self.gen_digest_file(normpath(destdir+"/"+i)) else: destdir=normpath(self.settings["target_path"]+"/"+pkgset) - print "Digesting files in the srcset....." + log.notice('Digesting files in the srcset...') digests=glob.glob(destdir+'/*.DIGESTS') for i in digests: -- 2.5.2