| 1 |
From: Matt Turner <mattst88@×××××.com> |
| 2 |
|
| 3 |
--- |
| 4 |
modules/generic_stage_target.py | 20 ++++++++------------ |
| 5 |
modules/netboot_target.py | 2 +- |
| 6 |
modules/stage2_target.py | 2 +- |
| 7 |
modules/stage4_target.py | 2 +- |
| 8 |
4 files changed, 11 insertions(+), 15 deletions(-) |
| 9 |
|
| 10 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 11 |
index 9e49ee8..0a473ef 100644 |
| 12 |
--- a/modules/generic_stage_target.py |
| 13 |
+++ b/modules/generic_stage_target.py |
| 14 |
@@ -475,7 +475,7 @@ class generic_stage_target(generic_target): |
| 15 |
"base_dirs","bind","chroot_setup","setup_environment",\ |
| 16 |
"run_local","preclean","unbind","clean"] |
| 17 |
# if "TARBALL" in self.settings or \ |
| 18 |
-# not self.settings.has_key("FETCH"): |
| 19 |
+# "FETCH" not in self.settings: |
| 20 |
if "FETCH" not in self.settings: |
| 21 |
self.settings["action_sequence"].append("capture") |
| 22 |
self.settings["action_sequence"].append("clear_autoresume") |
| 23 |
@@ -1444,8 +1444,7 @@ class generic_stage_target(generic_target): |
| 24 |
If we need to pass special options to the bootloader |
| 25 |
for this kernel put them into the environment |
| 26 |
""" |
| 27 |
- if self.settings.has_key("boot/kernel/"+kname+\ |
| 28 |
- "/kernelopts"): |
| 29 |
+ if "boot/kernel/"+kname+"/kernelopts" in self.settings: |
| 30 |
myopts=self.settings["boot/kernel/"+kname+\ |
| 31 |
"/kernelopts"] |
| 32 |
|
| 33 |
@@ -1456,8 +1455,7 @@ class generic_stage_target(generic_target): |
| 34 |
else: |
| 35 |
self.env[kname+"_kernelopts"]="" |
| 36 |
|
| 37 |
- if not self.settings.has_key("boot/kernel/"+kname+\ |
| 38 |
- "/extraversion"): |
| 39 |
+ if "boot/kernel/"+kname+"/extraversion" not in self.settings: |
| 40 |
self.settings["boot/kernel/"+kname+\ |
| 41 |
"/extraversion"]="" |
| 42 |
|
| 43 |
@@ -1465,8 +1463,7 @@ class generic_stage_target(generic_target): |
| 44 |
self.settings["boot/kernel/"+kname+\ |
| 45 |
"/extraversion"] |
| 46 |
|
| 47 |
- if self.settings.has_key("boot/kernel/"+kname+\ |
| 48 |
- "/initramfs_overlay"): |
| 49 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
| 50 |
if os.path.exists(self.settings["boot/kernel/"+\ |
| 51 |
kname+"/initramfs_overlay"]): |
| 52 |
print "Copying initramfs_overlay dir "+\ |
| 53 |
@@ -1491,8 +1488,7 @@ class generic_stage_target(generic_target): |
| 54 |
" kernel "+kname,\ |
| 55 |
"Runscript kernel build failed",env=self.env) |
| 56 |
|
| 57 |
- if self.settings.has_key("boot/kernel/"+kname+\ |
| 58 |
- "/initramfs_overlay"): |
| 59 |
+ if "boot/kernel/"+kname+"/initramfs_overlay" in self.settings: |
| 60 |
if os.path.exists(self.settings["chroot_path"]+\ |
| 61 |
"/tmp/initramfs_overlay/"): |
| 62 |
print "Cleaning up temporary overlay dir" |
| 63 |
@@ -1636,7 +1632,7 @@ class generic_stage_target(generic_target): |
| 64 |
array.sort() |
| 65 |
for j in array: |
| 66 |
contents=generate_contents(file,contents_function=j,\ |
| 67 |
- verbose=self.settings.has_key("VERBOSE")) |
| 68 |
+ verbose="VERBOSE" in self.settings) |
| 69 |
if contents: |
| 70 |
myf.write(contents) |
| 71 |
myf.close() |
| 72 |
@@ -1657,12 +1653,12 @@ class generic_stage_target(generic_target): |
| 73 |
if "all" in array: |
| 74 |
for k in hash_map.keys(): |
| 75 |
hash=generate_hash(f,hash_function=k,verbose=\ |
| 76 |
- self.settings.has_key("VERBOSE")) |
| 77 |
+ "VERBOSE" in self.settings) |
| 78 |
myf.write(hash) |
| 79 |
else: |
| 80 |
for j in array: |
| 81 |
hash=generate_hash(f,hash_function=j,verbose=\ |
| 82 |
- self.settings.has_key("VERBOSE")) |
| 83 |
+ "VERBOSE" in self.settings) |
| 84 |
myf.write(hash) |
| 85 |
myf.close() |
| 86 |
|
| 87 |
diff --git a/modules/netboot_target.py b/modules/netboot_target.py |
| 88 |
index c77943b..ff2c81f 100644 |
| 89 |
--- a/modules/netboot_target.py |
| 90 |
+++ b/modules/netboot_target.py |
| 91 |
@@ -46,7 +46,7 @@ class netboot_target(generic_stage_target): |
| 92 |
# unless the user wants specific CFLAGS/CXXFLAGS, let's use -Os |
| 93 |
|
| 94 |
for envvar in "CFLAGS", "CXXFLAGS": |
| 95 |
- if not os.environ.has_key(envvar) and not addlargs.has_key(envvar) |
| 96 |
+ if envvar not in os.environ and envvar not in addlargs: |
| 97 |
self.settings[envvar] = "-Os -pipe" |
| 98 |
|
| 99 |
def set_root_path(self): |
| 100 |
diff --git a/modules/stage2_target.py b/modules/stage2_target.py |
| 101 |
index 4b3c29a..6083e2b 100644 |
| 102 |
--- a/modules/stage2_target.py |
| 103 |
+++ b/modules/stage2_target.py |
| 104 |
@@ -16,7 +16,7 @@ class stage2_target(generic_stage_target): |
| 105 |
generic_stage_target.__init__(self,spec,addlargs) |
| 106 |
|
| 107 |
def set_source_path(self): |
| 108 |
- if "SEEDCACHE") and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/") in self.settings: |
| 109 |
+ if "SEEDCACHE" in self.settings and os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")): |
| 110 |
self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/") |
| 111 |
else: |
| 112 |
self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2") |
| 113 |
diff --git a/modules/stage4_target.py b/modules/stage4_target.py |
| 114 |
index 65c9dd0..ce41b2d 100644 |
| 115 |
--- a/modules/stage4_target.py |
| 116 |
+++ b/modules/stage4_target.py |
| 117 |
@@ -32,7 +32,7 @@ class stage4_target(generic_stage_target): |
| 118 |
"clean"] |
| 119 |
|
| 120 |
# if "TARBALL" in self.settings or \ |
| 121 |
-# not self.settings.has_key("FETCH"): |
| 122 |
+# "FETCH" not in self.settings: |
| 123 |
if "FETCH" not in self.settings: |
| 124 |
self.settings["action_sequence"].append("capture") |
| 125 |
self.settings["action_sequence"].append("clear_autoresume") |
| 126 |
-- |
| 127 |
1.7.8.6 |
Archives