Gentoo Archives: gentoo-catalyst

From: Mike Frysinger <vapier@g.o>
To: gentoo-catalyst@l.g.o
Subject: [gentoo-catalyst] [PATCH 07/10] livecd_stage: convert to log module
Date: Sun, 11 Oct 2015 06:29:35
Message-Id: 1444544952-32408-7-git-send-email-vapier@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 01/10] stage1: convert to log module by Mike Frysinger
1 ---
2 catalyst/targets/livecd_stage1.py | 4 ++--
3 catalyst/targets/livecd_stage2.py | 3 ++-
4 2 files changed, 4 insertions(+), 3 deletions(-)
5
6 diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py
7 index 262db70..8d9dcc7 100644
8 --- a/catalyst/targets/livecd_stage1.py
9 +++ b/catalyst/targets/livecd_stage1.py
10 @@ -6,7 +6,7 @@ LiveCD stage1 target
11 import os
12 import types
13
14 -
15 +from catalyst import log
16 from catalyst.support import (normpath, cmd)
17 from catalyst.fileops import ensure_dirs
18
19 @@ -34,7 +34,7 @@ class livecd_stage1(StageBase):
20 self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
21 if "autoresume" in self.settings["options"] \
22 and self.resume.is_enabled("setup_target_path"):
23 - print "Resume point detected, skipping target path setup operation..."
24 + log.notice('Resume point detected, skipping target path setup operation...')
25 else:
26 # first clean up any existing target stuff
27 if os.path.exists(self.settings["target_path"]):
28 diff --git a/catalyst/targets/livecd_stage2.py b/catalyst/targets/livecd_stage2.py
29 index b54f2f0..fa76421 100644
30 --- a/catalyst/targets/livecd_stage2.py
31 +++ b/catalyst/targets/livecd_stage2.py
32 @@ -5,6 +5,7 @@ LiveCD stage2 target, builds upon previous LiveCD stage1 tarball
33
34 import os
35
36 +from catalyst import log
37 from catalyst.support import (normpath, file_locate, CatalystError, cmd)
38 from catalyst.fileops import ensure_dirs
39 from catalyst.base.stagebase import StageBase
40 @@ -55,7 +56,7 @@ class livecd_stage2(StageBase):
41 self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"])
42 if "autoresume" in self.settings["options"] \
43 and self.resume.is_enabled("setup_target_path"):
44 - print "Resume point detected, skipping target path setup operation..."
45 + log.notice('Resume point detected, skipping target path setup operation...')
46 else:
47 # first clean up any existing target stuff
48 if os.path.isdir(self.settings["target_path"]):
49 --
50 2.5.2