Remove some troublesome trailing slashes from paths

[catalyst.git] / modules / netboot_target.py

diff --git a/modules/netboot_target.py b/modules/netboot_target.py
index 44392845486c1e8fb7587aebad4db30fd3f0c9b7..ff2c81fb88f039356363cd43812d28eab1fe975a 100644 (file)
--- a/modules/netboot_target.py
+++ b/modules/netboot_target.py
@@ -1,14 +1,16 @@
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/netboot_target.py,v 1.13 2006/10/02 20:41:54 wolf31o2 Exp $
-
 """
-Builder class for a netboot build.
+netboot target, version 1
 """
+# NOTE: That^^ docstring has influence catalyst-spec(5) man page generation.
 
 import os,string,types
 from catalyst_support import *
 from generic_stage_target import *
 
 class netboot_target(generic_stage_target):
+       """
+       Builder class for a netboot build.
+       """
        def __init__(self,spec,addlargs):
                self.valid_values = [
                        "netboot/kernel/sources",
@@ -21,35 +23,31 @@ class netboot_target(generic_stage_target):
                        "netboot/packages"
                ]
                self.required_values=[]
-                       
+
                try:
-                       if addlargs.has_key("netboot/packages"):
+                       if "netboot/packages" in addlargs:
                                if type(addlargs["netboot/packages"]) == types.StringType:
                                        loopy=[addlargs["netboot/packages"]]
                                else:
                                        loopy=addlargs["netboot/packages"]
-                       
+
                #       for x in loopy:
                #               self.required_values.append("netboot/packages/"+x+"/files")
                except:
                        raise CatalystError,"configuration error in netboot/packages."
-               
-               
-               
 
                generic_stage_target.__init__(self,spec,addlargs)
                self.set_build_kernel_vars(addlargs)
-               if addlargs.has_key("netboot/busybox_config"):
+               if "netboot/busybox_config" in addlargs:
                        file_locate(self.settings, ["netboot/busybox_config"])
 
                # Custom Kernel Tarball --- use that instead ...
 
                # 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):
                # ROOT= variable for emerges
@@ -58,17 +56,17 @@ class netboot_target(generic_stage_target):
 
 #      def build_packages(self):
 #              # build packages
-#              if self.settings.has_key("netboot/packages"):
+#              if "netboot/packages" in self.settings:
 #                      mypack=list_bashify(self.settings["netboot/packages"])
 #              try:
 #                      cmd("/bin/bash "+self.settings["controller_file"]+" packages "+mypack,env=self.env)
 #              except CatalystError:
 #                      self.unbind()
 #                      raise CatalystError,"netboot build aborting due to error."
-       
+
        def build_busybox(self):
                # build busybox
-               if self.settings.has_key("netboot/busybox_config"):
+               if "netboot/busybox_config" in self.settings:
                        mycmd = self.settings["netboot/busybox_config"]
                else:
                        mycmd = ""
@@ -77,25 +75,24 @@ class netboot_target(generic_stage_target):
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"netboot build aborting due to error."
-       
 
        def copy_files_to_image(self):
                # create image
                myfiles=[]
-               if self.settings.has_key("netboot/packages"):
+               if "netboot/packages" in self.settings:
                        if type(self.settings["netboot/packages"]) == types.StringType:
                                loopy=[self.settings["netboot/packages"]]
                        else:
                                loopy=self.settings["netboot/packages"]
-               
+
                for x in loopy:
-                       if self.settings.has_key("netboot/packages/"+x+"/files"):
+                       if "netboot/packages/"+x+"/files" in self.settings:
                            if type(self.settings["netboot/packages/"+x+"/files"]) == types.ListType:
                                    myfiles.extend(self.settings["netboot/packages/"+x+"/files"])
                            else:
                                    myfiles.append(self.settings["netboot/packages/"+x+"/files"])
 
-               if self.settings.has_key("netboot/extra_files"):
+               if "netboot/extra_files" in self.settings:
                        if type(self.settings["netboot/extra_files"]) == types.ListType:
                                myfiles.extend(self.settings["netboot/extra_files"])
                        else:
@@ -108,7 +105,6 @@ class netboot_target(generic_stage_target):
                        self.unbind()
                        raise CatalystError,"netboot build aborting due to error."
 
-
        def create_netboot_files(self):
                # finish it all up
                try:
@@ -120,7 +116,6 @@ class netboot_target(generic_stage_target):
                # end
                print "netboot: build finished !"
 
-
        def set_action_sequence(self):
            self.settings["action_sequence"]=["unpack","unpack_snapshot",
                                        "config_profile_link","setup_confdir","bind","chroot_setup",\