1 |
commit: e60ef20eb3ef4d64a9d7b24f4b1d2d36c026ff7c |
2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 05:11:40 2015 +0000 |
4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 23:54:36 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e60ef20e |
7 |
|
8 |
stage1: convert to log module |
9 |
|
10 |
catalyst/targets/stage1.py | 38 ++++++++++++++++---------------------- |
11 |
1 file changed, 16 insertions(+), 22 deletions(-) |
12 |
|
13 |
diff --git a/catalyst/targets/stage1.py b/catalyst/targets/stage1.py |
14 |
index b5dfac7..18ef520 100644 |
15 |
--- a/catalyst/targets/stage1.py |
16 |
+++ b/catalyst/targets/stage1.py |
17 |
@@ -5,6 +5,9 @@ stage1 target |
18 |
|
19 |
import os |
20 |
|
21 |
+from snakeoil import fileutils |
22 |
+ |
23 |
+from catalyst import log |
24 |
from catalyst.support import normpath |
25 |
from catalyst.fileops import ensure_dirs |
26 |
from catalyst.base.stagebase import StageBase |
27 |
@@ -22,12 +25,12 @@ class stage1(StageBase): |
28 |
|
29 |
def set_stage_path(self): |
30 |
self.settings["stage_path"]=normpath(self.settings["chroot_path"]+self.settings["root_path"]) |
31 |
- print "stage1 stage path is "+self.settings["stage_path"] |
32 |
+ log.notice('stage1 stage path is %s', self.settings['stage_path']) |
33 |
|
34 |
def set_root_path(self): |
35 |
# sets the root path, relative to 'chroot_path', of the stage1 root |
36 |
self.settings["root_path"]=normpath("/tmp/stage1root") |
37 |
- print "stage1 root path is "+self.settings["root_path"] |
38 |
+ log.info('stage1 root path is %s', self.settings['root_path']) |
39 |
|
40 |
def set_cleanables(self): |
41 |
StageBase.set_cleanables(self) |
42 |
@@ -55,10 +58,10 @@ class stage1(StageBase): |
43 |
def set_portage_overlay(self): |
44 |
StageBase.set_portage_overlay(self) |
45 |
if "portage_overlay" in self.settings: |
46 |
- print "\nWARNING !!!!!" |
47 |
- print "\tUsing an portage overlay for earlier stages could cause build issues." |
48 |
- print "\tIf you break it, you buy it. Don't complain to us about it." |
49 |
- print "\tDont say we did not warn you\n" |
50 |
+ log.warning( |
51 |
+ 'Using an overlay for earlier stages could cause build issues.\n' |
52 |
+ "If you break it, you buy it. Don't complain to us about it.\n" |
53 |
+ "Don't say we did not warn you.") |
54 |
|
55 |
def base_dirs(self): |
56 |
if os.uname()[0] == "FreeBSD": |
57 |
@@ -67,22 +70,13 @@ class stage1(StageBase): |
58 |
# since proc and dev are not writeable, so...create them here |
59 |
ensure_dirs(self.settings["stage_path"]+"/proc") |
60 |
ensure_dirs(self.settings["stage_path"]+"/dev") |
61 |
- if not os.path.isfile(self.settings["stage_path"]+"/proc/.keep"): |
62 |
- try: |
63 |
- proc_keepfile = open(self.settings["stage_path"]+"/proc/.keep","w") |
64 |
- proc_keepfile.write('') |
65 |
- proc_keepfile.close() |
66 |
- except IOError: |
67 |
- print "!!! Failed to create %s" % (self.settings["stage_path"]+"/dev/.keep") |
68 |
- if not os.path.isfile(self.settings["stage_path"]+"/dev/.keep"): |
69 |
- try: |
70 |
- dev_keepfile = open(self.settings["stage_path"]+"/dev/.keep","w") |
71 |
- dev_keepfile.write('') |
72 |
- dev_keepfile.close() |
73 |
- except IOError: |
74 |
- print "!!! Failed to create %s" % (self.settings["stage_path"]+"/dev/.keep") |
75 |
- else: |
76 |
- pass |
77 |
+ for f in ('/proc', '/dev'): |
78 |
+ f = self.settings['stage_path'] + f + '/.keep' |
79 |
+ if not os.path.isfile(f): |
80 |
+ try: |
81 |
+ fileutils.touch(f) |
82 |
+ except IOError: |
83 |
+ log.error('Failed to create %s', f) |
84 |
|
85 |
def set_mounts(self): |
86 |
# stage_path/proc probably doesn't exist yet, so create it |