commit: 7135c0e1bc266fe1c913a67f547cd1fcae558bbf
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 10 05:50:39 2015 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Oct 11 05:56:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7135c0e1
embedded/grp: convert to log module
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:
