diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-10-10 01:50:39 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-10-11 01:56:21 -0400 |
| commit | 7135c0e1bc266fe1c913a67f547cd1fcae558bbf (patch) | |
| tree | c453fc8f1768d3669f806eda78387181a461ddbb | |
| parent | netboot: convert to log module (diff) | |
| download | catalyst-7135c0e1bc266fe1c913a67f547cd1fcae558bbf.tar.gz catalyst-7135c0e1bc266fe1c913a67f547cd1fcae558bbf.tar.bz2 catalyst-7135c0e1bc266fe1c913a67f547cd1fcae558bbf.zip | |
embedded/grp: convert to log module
| -rw-r--r-- | catalyst/targets/embedded.py | 7 | ||||
| -rw-r--r-- | 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 6044e175..e441757b 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 4814ac69..b37366c4 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: |