catalyst 2.0.12.1

[catalyst.git] / catalyst

diff --git a/catalyst b/catalyst
index efcaa15a65e47da62c73852aaea16b54cde6d6f9..96622255d7efa9d1abbc7afb711d7cc3bad9ea68 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.6.916"
+__maintainer__="Catalyst <catalyst@gentoo.org>"
+__version__="2.0.12.1"
 
 conf_values={}
 
@@ -32,6 +34,7 @@ def usage():
        print " -h --help       print this help message"
        print " -p --purge      clear tmp dirs,package cache and autoresume flags"
        print " -P --purgeonly  clear tmp dirs,package cache and autoresume flags and exit"
+       print " -T --purgetmponly  clear tmp dirs and autoresume flags and exit"
        print " -s --snapshot   generate a release snapshot"
        print " -V --version    display version information"
        print " -v --verbose    verbose output"
@@ -50,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):
@@ -149,10 +152,6 @@ def parse_config(myconfig):
                print "Snapshot cache support enabled."
                conf_values["SNAPCACHE"]="1"
 
-       if "metadata_overlay" in conf_values["options"].split():
-               print "Use of metadata_overlay module for portage enabled."
-               conf_values["METADATA_OVERLAY"]="1"
-
 #      if "tarball" in string.split(conf_values["options"]):
 #              print "Tarball creation enabled."
 #              conf_values["TARBALL"]="1"
@@ -166,6 +165,12 @@ def parse_config(myconfig):
                print "Envscript support enabled."
                conf_values["ENVSCRIPT"]=myconf["envscript"]
 
+       if myconf.has_key("var_tmpfs_portage"):
+               conf_values["var_tmpfs_portage"]=myconf["var_tmpfs_portage"];
+
+       if myconf.has_key("port_logdir"):
+               conf_values["port_logdir"]=myconf["port_logdir"];
+
 def import_modules():
        # import catalyst's own modules (i.e. catalyst_support and the arch modules)
        targetmap={}
@@ -179,7 +184,7 @@ def import_modules():
 
                        except IOError:
                                raise CatalystError,"Can't find "+x+".py plugin in "+\
-                                       conf_values.settings["sharedir"]+"/modules/"
+                                       conf_values["sharedir"]+"/modules/"
 
                for x in valid_build_targets:
                        try:
@@ -190,7 +195,7 @@ def import_modules():
 
                        except IOError:
                                raise CatalystError,"Can't find "+x+".py plugin in "+\
-                                       conf_values.settings["sharedir"]+"/modules/"
+                                       conf_values["sharedir"]+"/modules/"
 
        except ImportError:
                print "!!! catalyst: Python modules not found in "+\
@@ -229,7 +234,7 @@ if __name__ == "__main__":
 
        # parse out the command line arguments
        try:
-               opts,args = getopt.getopt(sys.argv[1:], "apPhvdc:C:f:FVs:", ["purge", "purgeonly", "help", "version", "debug",\
+               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:
@@ -301,6 +306,9 @@ if __name__ == "__main__":
                if o in ("-P", "--purgeonly"):
                        conf_values["PURGEONLY"] = "1"
 
+               if o in ("-T", "--purgetmponly"):
+                       conf_values["PURGETMPONLY"] = "1"
+
                if o in ("-a", "--clear-autoresume"):
                        conf_values["CLEAR_AUTORESUME"] = "1"