| 1 |
commit: 9cbedb5c8c8e2158e5e21e3038a0651cd4fe66e9 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Oct 10 05:28:45 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 11 05:56:09 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=9cbedb5c |
| 7 |
|
| 8 |
livecd_stage: convert to log module |
| 9 |
|
| 10 |
catalyst/targets/livecd_stage1.py | 4 ++-- |
| 11 |
catalyst/targets/livecd_stage2.py | 3 ++- |
| 12 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
| 15 |
index 262db70..8d9dcc7 100644 |
| 16 |
--- a/catalyst/targets/livecd_stage1.py |
| 17 |
+++ b/catalyst/targets/livecd_stage1.py |
| 18 |
@@ -6,7 +6,7 @@ LiveCD stage1 target |
| 19 |
import os |
| 20 |
import types |
| 21 |
|
| 22 |
- |
| 23 |
+from catalyst import log |
| 24 |
from catalyst.support import (normpath, cmd) |
| 25 |
from catalyst.fileops import ensure_dirs |
| 26 |
|
| 27 |
@@ -34,7 +34,7 @@ class livecd_stage1(StageBase): |
| 28 |
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) |
| 29 |
if "autoresume" in self.settings["options"] \ |
| 30 |
and self.resume.is_enabled("setup_target_path"): |
| 31 |
- print "Resume point detected, skipping target path setup operation..." |
| 32 |
+ log.notice('Resume point detected, skipping target path setup operation...') |
| 33 |
else: |
| 34 |
# first clean up any existing target stuff |
| 35 |
if os.path.exists(self.settings["target_path"]): |
| 36 |
|
| 37 |
diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py |
| 38 |
index b54f2f0..fa76421 100644 |
| 39 |
--- a/catalyst/targets/livecd_stage2.py |
| 40 |
+++ b/catalyst/targets/livecd_stage2.py |
| 41 |
@@ -5,6 +5,7 @@ LiveCD stage2 target, builds upon previous LiveCD stage1 tarball |
| 42 |
|
| 43 |
import os |
| 44 |
|
| 45 |
+from catalyst import log |
| 46 |
from catalyst.support import (normpath, file_locate, CatalystError, cmd) |
| 47 |
from catalyst.fileops import ensure_dirs |
| 48 |
from catalyst.base.stagebase import StageBase |
| 49 |
@@ -55,7 +56,7 @@ class livecd_stage2(StageBase): |
| 50 |
self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]) |
| 51 |
if "autoresume" in self.settings["options"] \ |
| 52 |
and self.resume.is_enabled("setup_target_path"): |
| 53 |
- print "Resume point detected, skipping target path setup operation..." |
| 54 |
+ log.notice('Resume point detected, skipping target path setup operation...') |
| 55 |
else: |
| 56 |
# first clean up any existing target stuff |
| 57 |
if os.path.isdir(self.settings["target_path"]): |
Archives