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