From: Matt Turner <[email protected]>
---
modules/generic_stage_target.py | 20 ++++++++------------
modules/netboot_target.py | 2 +-
modules/stage2_target.py | 2 +-
modules/stage4_target.py | 2 +-
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 9e49ee8..0a473ef 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -475,7 +475,7 @@ class generic_stage_target(generic_target):
"base_dirs","bind","chroot_setup","setup_environment",\
"run_local","preclean","unbind","clean"]
# if "TARBALL" in self.settings or \
-# not self.settings.has_key("FETCH"):
+# "FETCH" not in self.settings:
if "FETCH" not in self.settings:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
@@ -1444,8 +1444,7 @@ class generic_stage_target(generic_target):
If we need to pass
special options to the bootloader
for this kernel put
them into the environment
"""
- if
self.settings.has_key("boot/kernel/"+kname+\
- "/kernelopts"):
+ if
"boot/kernel/"+kname+"/kernelopts" in self.settings:
myopts=self.settings["boot/kernel/"+kname+\
"/kernelopts"]
@@ -1456,8 +1455,7 @@ class generic_stage_target(generic_target):
else:
self.env[kname+"_kernelopts"]=""
- if not
self.settings.has_key("boot/kernel/"+kname+\
-
"/extraversion"):
+ if
"boot/kernel/"+kname+"/extraversion" not in self.settings:
self.settings["boot/kernel/"+kname+\
"/extraversion"]=""
@@ -1465,8 +1463,7 @@ class generic_stage_target(generic_target):
self.settings["boot/kernel/"+kname+\
"/extraversion"]
- if
self.settings.has_key("boot/kernel/"+kname+\
-
"/initramfs_overlay"):
+ if
"boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
if
os.path.exists(self.settings["boot/kernel/"+\
kname+"/initramfs_overlay"]):
print
"Copying initramfs_overlay dir "+\
@@ -1491,8 +1488,7 @@ class generic_stage_target(generic_target):
" kernel
"+kname,\
"Runscript
kernel build failed",env=self.env)
- if
self.settings.has_key("boot/kernel/"+kname+\
-
"/initramfs_overlay"):
+ if
"boot/kernel/"+kname+"/initramfs_overlay" in self.settings:
if
os.path.exists(self.settings["chroot_path"]+\
"/tmp/initramfs_overlay/"):
print
"Cleaning up temporary overlay dir"
@@ -1636,7 +1632,7 @@ class generic_stage_target(generic_target):
array.sort()
for j in array:
contents=generate_contents(file,contents_function=j,\
-
verbose=self.settings.has_key("VERBOSE"))
+ verbose="VERBOSE" in
self.settings)
if contents:
myf.write(contents)
myf.close()
@@ -1657,12 +1653,12 @@ class generic_stage_target(generic_target):
if "all" in array:
for k in
hash_map.keys():
hash=generate_hash(f,hash_function=k,verbose=\
-
self.settings.has_key("VERBOSE"))
+
"VERBOSE" in self.settings)
myf.write(hash)
else:
for j in array:
hash=generate_hash(f,hash_function=j,verbose=\
-
self.settings.has_key("VERBOSE"))
+
"VERBOSE" in self.settings)
myf.write(hash)
myf.close()
diff --git a/modules/netboot_target.py b/modules/netboot_target.py
index c77943b..ff2c81f 100644
--- a/modules/netboot_target.py
+++ b/modules/netboot_target.py
@@ -46,7 +46,7 @@ class netboot_target(generic_stage_target):
# unless the user wants specific CFLAGS/CXXFLAGS, let's use -Os
for envvar in "CFLAGS", "CXXFLAGS":
- if not os.environ.has_key(envvar) and not
addlargs.has_key(envvar)
+ if envvar not in os.environ and envvar not in addlargs:
self.settings[envvar] = "-Os -pipe"
def set_root_path(self):
diff --git a/modules/stage2_target.py b/modules/stage2_target.py
index 4b3c29a..6083e2b 100644
--- a/modules/stage2_target.py
+++ b/modules/stage2_target.py
@@ -16,7 +16,7 @@ class stage2_target(generic_stage_target):
generic_stage_target.__init__(self,spec,addlargs)
def set_source_path(self):
- if "SEEDCACHE") and
os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
in self.settings:
+ if "SEEDCACHE" in self.settings and
os.path.isdir(normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")):
self.settings["source_path"]=normpath(self.settings["storedir"]+"/tmp/"+self.settings["source_subpath"]+"/tmp/stage1root/")
else:
self.settings["source_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["source_subpath"]+".tar.bz2")
diff --git a/modules/stage4_target.py b/modules/stage4_target.py
index 65c9dd0..ce41b2d 100644
--- a/modules/stage4_target.py
+++ b/modules/stage4_target.py
@@ -32,7 +32,7 @@ class stage4_target(generic_stage_target):
"clean"]
# if "TARBALL" in self.settings or \
-# not self.settings.has_key("FETCH"):
+# "FETCH" not in self.settings:
if "FETCH" not in self.settings:
self.settings["action_sequence"].append("capture")
self.settings["action_sequence"].append("clear_autoresume")
--
1.7.8.6
