examples: Add newlines to accidentally unwrapped comment lines

[catalyst.git] / catalyst

diff --git a/catalyst b/catalyst
index 96622255d7efa9d1abbc7afb711d7cc3bad9ea68..9f8dd30127c7c7fbdf2803e43eda90ae213e7467 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -19,7 +19,7 @@ import catalyst.config
 import catalyst.util
 
 __maintainer__="Catalyst <catalyst@gentoo.org>"
-__version__="2.0.12.1"
+__version__="2.0.12.2"
 
 conf_values={}
 
@@ -100,7 +100,7 @@ def parse_config(myconfig):
        
        # now, load up the values into conf_values so that we can use them
        for x in confdefaults.keys():
-               if myconf.has_key(x):
+               if x in myconf:
                        print "Setting",x,"to config file value \""+myconf[x]+"\""
                        conf_values[x]=myconf[x]
                else:
@@ -112,6 +112,14 @@ def parse_config(myconfig):
                print "Autoresuming support enabled."
                conf_values["AUTORESUME"]="1"
 
+       if "bindist" in string.split(conf_values["options"]):
+               print "Binary redistribution enabled"
+               conf_values["BINDIST"]="1"
+       else:
+               print "Bindist is not enabled in catalyst.conf"
+               print "Binary redistribution of generated stages/isos may be prohibited by law."
+               print "Please see the use description for bindist on any package you are including."
+
        if "ccache" in string.split(conf_values["options"]):
                print "Compiler cache support enabled."
                conf_values["CCACHE"]="1"
@@ -156,19 +164,19 @@ def parse_config(myconfig):
 #              print "Tarball creation enabled."
 #              conf_values["TARBALL"]="1"
 
-       if myconf.has_key("digests"):
+       if "digests" in myconf:
                conf_values["digests"]=myconf["digests"]
-       if myconf.has_key("contents"):
+       if "contents" in myconf:
                conf_values["contents"]=myconf["contents"]
 
-       if myconf.has_key("envscript"):
+       if "envscript" in myconf:
                print "Envscript support enabled."
                conf_values["ENVSCRIPT"]=myconf["envscript"]
 
-       if myconf.has_key("var_tmpfs_portage"):
+       if "var_tmpfs_portage" in myconf:
                conf_values["var_tmpfs_portage"]=myconf["var_tmpfs_portage"];
 
-       if myconf.has_key("port_logdir"):
+       if "port_logdir" in myconf:
                conf_values["port_logdir"]=myconf["port_logdir"];
 
 def import_modules():
@@ -206,7 +214,7 @@ def import_modules():
 
 def build_target(addlargs, targetmap):
        try:
-               if not targetmap.has_key(addlargs["target"]):
+               if addlargs["target"] not in targetmap:
                        raise CatalystError,"Target \""+addlargs["target"]+"\" not available."
                
                mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
@@ -324,9 +332,9 @@ if __name__ == "__main__":
        
        # Start checking that digests are valid now that the hash_map was imported
        # from catalyst_support
-       if conf_values.has_key("digests"):
+       if "digests" in conf_values:
                for i in conf_values["digests"].split():
-                       if not hash_map.has_key(i):
+                       if i not in hash_map:
                                print
                                print i+" is not a valid digest entry"
                                print "Valid digest entries:"
@@ -342,8 +350,8 @@ if __name__ == "__main__":
                                print
                                print "Catalyst aborting...."
                                sys.exit(2)
-       if conf_values.has_key("hash_function"):
-               if not hash_map.has_key(conf_values["hash_function"]):
+       if "hash_function" in conf_values:
+               if conf_values["hash_function"] not in hash_map:
                        print
                        print conf_values["hash_function"]+\
                                " is not a valid hash_function entry"
@@ -379,7 +387,7 @@ if __name__ == "__main__":
                        print "!!! catalyst: Could not parse commandline, exiting."
                        sys.exit(1)
 
-       if not addlargs.has_key("target"):
+       if "target" not in addlargs:
                raise CatalystError, "Required value \"target\" not specified."
 
        # everything is setup, so the build is a go