| 1 |
commit: 7135c0e1bc266fe1c913a67f547cd1fcae558bbf |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 05:50:39 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 05:56:21 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=7135c0e1 |
| 7 |
|
| 8 |
embedded/grp: convert to log module |
| 9 |
|
| 10 |
catalyst/targets/embedded.py | 7 +++---- |
| 11 |
catalyst/targets/grp.py | 8 ++++---- |
| 12 |
2 files changed, 7 insertions(+), 8 deletions(-) |
| 13 |
|
| 14 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 15 |
index 6044e17..e441757 100644 |
| 16 |
--- a/catalyst/targets/embedded.py |
| 17 |
+++ b/catalyst/targets/embedded.py |
| 18 |
@@ -10,9 +10,8 @@ ROOT=/tmp/submerge emerge --something foo bar . |
| 19 |
""" |
| 20 |
# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation. |
| 21 |
|
| 22 |
- |
| 23 |
+from catalyst import log |
| 24 |
from catalyst.support import normpath |
| 25 |
- |
| 26 |
from catalyst.base.stagebase import StageBase |
| 27 |
|
| 28 |
class embedded(StageBase): |
| 29 |
@@ -39,8 +38,8 @@ class embedded(StageBase): |
| 30 |
|
| 31 |
def set_stage_path(self): |
| 32 |
self.settings["stage_path"]=normpath(self.settings["chroot_path"]+"/tmp/mergeroot") |
| 33 |
- print "embedded stage path is "+self.settings["stage_path"] |
| 34 |
+ log.info('embedded stage path is %s', self.settings['stage_path']) |
| 35 |
|
| 36 |
def set_root_path(self): |
| 37 |
self.settings["root_path"]=normpath("/tmp/mergeroot") |
| 38 |
- print "embedded root path is "+self.settings["root_path"] |
| 39 |
+ log.info('embedded root path is %s', self.settings['root_path']) |
| 40 |
|
| 41 |
diff --git a/catalyst/targets/grp.py b/catalyst/targets/grp.py |
| 42 |
index 4814ac6..b37366c 100644 |
| 43 |
--- a/catalyst/targets/grp.py |
| 44 |
+++ b/catalyst/targets/grp.py |
| 45 |
@@ -7,7 +7,7 @@ import os |
| 46 |
import types |
| 47 |
import glob |
| 48 |
|
| 49 |
- |
| 50 |
+from catalyst import log |
| 51 |
from catalyst.support import (CatalystError, normpath, cmd, list_bashify) |
| 52 |
from catalyst.fileops import ensure_dirs |
| 53 |
from catalyst.base.stagebase import StageBase |
| 54 |
@@ -44,7 +44,7 @@ class grp(StageBase): |
| 55 |
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) |
| 56 |
if "autoresume" in self.settings["options"] \ |
| 57 |
and self.resume.is_enabled("setup_target_path"): |
| 58 |
- print "Resume point detected, skipping target path setup operation..." |
| 59 |
+ log.notice('Resume point detected, skipping target path setup operation...') |
| 60 |
else: |
| 61 |
# first clean up any existing target stuff |
| 62 |
#if os.path.isdir(self.settings["target_path"]): |
| 63 |
@@ -82,7 +82,7 @@ class grp(StageBase): |
| 64 |
for pkgset in self.settings["grp"]: |
| 65 |
if self.settings["grp/"+pkgset+"/type"] == "pkgset": |
| 66 |
destdir=normpath(self.settings["target_path"]+"/"+pkgset+"/All") |
| 67 |
- print "Digesting files in the pkgset....." |
| 68 |
+ log.notice('Digesting files in the pkgset...') |
| 69 |
digests=glob.glob(destdir+'/*.DIGESTS') |
| 70 |
for i in digests: |
| 71 |
if os.path.exists(i): |
| 72 |
@@ -97,7 +97,7 @@ class grp(StageBase): |
| 73 |
self.gen_digest_file(normpath(destdir+"/"+i)) |
| 74 |
else: |
| 75 |
destdir=normpath(self.settings["target_path"]+"/"+pkgset) |
| 76 |
- print "Digesting files in the srcset....." |
| 77 |
+ log.notice('Digesting files in the srcset...') |
| 78 |
|
| 79 |
digests=glob.glob(destdir+'/*.DIGESTS') |
| 80 |
for i in digests: |
Archives