livecdfs-update.sh: Escape ampersands in STARTX sed expression
[catalyst.git] / catalyst
index 8f23cbd8ab8d82d2e18f26ad94240dca63215c91..c29c814f734c885886c88375e475e2e0559d4b40 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,6 +1,8 @@
 #!/usr/bin/python -OO
 
 # Maintained in full by:
+# Catalyst Team <catalyst@gentoo.org>
+# Release Engineering Team <releng@gentoo.org>
 # Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@wolf31o2.org>
 # $Id$
@@ -16,8 +18,8 @@ sys.path.append(__selfpath__ + "/modules")
 import catalyst.config
 import catalyst.util
 
-__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
-__version__="2.0.8"
+__maintainer__="Catalyst <catalyst@gentoo.org>"
+__version__="2.0.12.2"
 
 conf_values={}
 
@@ -51,7 +53,7 @@ def usage():
 def version():
        print "Catalyst, version "+__version__
        print "Copyright 2003-2008 Gentoo Foundation"
-       print "Copyright 2008-2011 various authors"
+       print "Copyright 2008-2012 various authors"
        print "Distributed under the GNU General Public License version 2.1\n"
 
 def parse_config(myconfig):
@@ -64,7 +66,7 @@ def parse_config(myconfig):
                "portdir":"/usr/portage","options":"",\
                "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\
                "hash_function":"crc32"}
-               
+
        # first, try the one passed (presumably from the cmdline)
        if myconfig:
                if os.path.exists(myconfig):
@@ -75,12 +77,12 @@ def parse_config(myconfig):
                        print "!!! catalyst: Could not use specified configuration file "+\
                                myconfig
                        sys.exit(1)
-       
+
        # next, try the default location
        elif os.path.exists("/etc/catalyst/catalyst.conf"):
                print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf"
                config_file="/etc/catalyst/catalyst.conf"
-       
+
        # can't find a config file (we are screwed), so bail out
        else:
                print "!!! catalyst: Could not find a suitable configuration file"
@@ -91,14 +93,14 @@ def parse_config(myconfig):
 #              execfile(config_file, myconf, myconf)
                myconfig = catalyst.config.ConfigParser(config_file)
                myconf.update(myconfig.get_values())
-       
+
        except:
                print "!!! catalyst: Unable to parse configuration file, "+myconfig
                sys.exit(1)
-       
+
        # 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:
@@ -110,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"
@@ -154,15 +164,21 @@ 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 "var_tmpfs_portage" in myconf:
+               conf_values["var_tmpfs_portage"]=myconf["var_tmpfs_portage"];
+
+       if "port_logdir" in myconf:
+               conf_values["port_logdir"]=myconf["port_logdir"];
+
 def import_modules():
        # import catalyst's own modules (i.e. catalyst_support and the arch modules)
        targetmap={}
@@ -198,11 +214,11 @@ 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)
-       
+
                mytarget.run()
 
        except:
@@ -212,7 +228,7 @@ def build_target(addlargs, targetmap):
 
 if __name__ == "__main__":
        targetmap={}
-       
+
        version()
        if os.getuid() != 0:
                # catalyst cannot be run as a normal user due to chroots, mounts, etc
@@ -228,11 +244,11 @@ if __name__ == "__main__":
        try:
                opts,args = getopt.getopt(sys.argv[1:], "apPThvdc:C:f:FVs:", ["purge", "purgeonly", "purgetmponly", "help", "version", "debug",\
                        "clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
-       
+
        except getopt.GetoptError:
                usage()
                sys.exit(2)
-       
+
        # defaults for commandline opts
        debug=False
        verbose=False
@@ -253,7 +269,7 @@ if __name__ == "__main__":
                if o in ("-h", "--help"):
                        usage()
                        sys.exit(1)
-               
+
                if o in ("-V", "--version"):
                        print "Catalyst version "+__version__
                        sys.exit(1)
@@ -271,14 +287,14 @@ if __name__ == "__main__":
                        while x < len(sys.argv):
                                mycmdline.append(sys.argv[x])
                                x=x+1
-                       
+
                if o in ("-f", "--file"):
                        run = True
                        myspecfile=a
 
                if o in ("-F", "--fetchonly"):
                        conf_values["FETCH"]="1"
-                       
+
                if o in ("-v", "--verbose"):
                        conf_values["VERBOSE"]="1"
 
@@ -291,7 +307,7 @@ if __name__ == "__main__":
                                run = True
                                mycmdline.append("target=snapshot")
                                mycmdline.append("version_stamp="+a)
-               
+
                if o in ("-p", "--purge"):
                        conf_values["PURGE"] = "1"
 
@@ -313,12 +329,12 @@ if __name__ == "__main__":
        parse_config(myconfig)
        sys.path.append(conf_values["sharedir"]+"/modules")
        from catalyst_support import *
-       
+
        # 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:"
@@ -334,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"
@@ -357,11 +373,11 @@ if __name__ == "__main__":
        targetmap=import_modules()
 
        addlargs={}
-       
+
        if myspecfile:
                spec = catalyst.config.SpecParser(myspecfile)
                addlargs.update(spec.get_values())
-       
+
        if mycmdline:
                try:
                        cmdline = catalyst.config.ConfigParser()
@@ -371,13 +387,13 @@ 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
        try:
                build_target(addlargs, targetmap)
-                       
+
        except CatalystError:
                print
                print "Catalyst aborting...."