Added emerge --info to debug output. I don't know why I didn't add it before.

[catalyst.git] / catalyst

diff --git a/catalyst b/catalyst
index 79679a4e8397e932dc5dab48142a1542f69dc10a..35dd14da516bff287163e8b15e938a6076ddf646 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,14 +1,14 @@
 #!/usr/bin/python -OO
 
 # Maintained in full by:
-# Eric Edgar <rocket@gentoo.org>
+# Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@gentoo.org>
 
 import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.3"
+__version__="2.0.6_pre17"
 
 conf_values={}
 
@@ -22,7 +22,7 @@ def usage():
        print " -F --fetchonly          fetch files only"
        print " -h --help               print this help message"
        print " -p --purge              clear tmp dirs,package cache and autoresume flags"
-       print " -s --snapshot           generate a Portage snapshot"
+       print " -s --snapshot           generate a release snapshot"
        print " -V --version            display version information"
        print " -v --verbose            verbose output"
        print
@@ -31,15 +31,15 @@ def usage():
        print "Using the commandline option (-C, --cli) to build a Portage snapshot:"
        print "catalyst -C target=snapshot version_stamp=my_date"
        print
-       print "Using the snapshot option (-s, --snapshot) to build a Portage snapshot:"
-       print "catalyst -s 20051208"
+       print "Using the snapshot option (-s, --snapshot) to build a release snapshot:"
+       print "catalyst -s 20071121"
        print
        print "Using the specfile option (-f, --file) to build a stage target:"
        print "catalyst -f stage1-specfile.spec"
 
 def version():
-       print "Gentoo Catalyst, version "+__version__
-       print "Copyright 2003-2006 The Gentoo Foundation"
+       print "Catalyst, version "+__version__
+       print "Copyright 2003-2008 Gentoo Foundation"
        print "Distributed under the GNU General Public License version 2\n"
 
 def parse_config(myconfig):
@@ -112,6 +112,10 @@ def parse_config(myconfig):
                print "Distcc support enabled."
                conf_values["DISTCC"]="1"
 
+       if "icecream" in string.split(conf_values["options"]):
+               print "Icecream compiler cluster support enabled."
+               conf_values["ICECREAM"]="1"
+
        if "kerncache" in string.split(conf_values["options"]):
                print "Kernel cache support enabled."
                conf_values["KERNCACHE"]="1"
@@ -132,12 +136,18 @@ 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"
 
        if myconf.has_key("digests"):
                conf_values["digests"]=myconf["digests"]
+       if myconf.has_key("contents"):
+               conf_values["contents"]=myconf["contents"]
 
        if myconf.has_key("envscript"):
                print "Envscript support enabled."
@@ -202,6 +212,8 @@ def build_target(addlargs, targetmap):
                mytarget.run()
 
        except:
+               # TODO: Capture traceback, so we can display this error after printing of the traceback
+               print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
                raise
 
 if __name__ == "__main__":
@@ -221,7 +233,7 @@ if __name__ == "__main__":
        # parse out the command line arguments
        try:
                opts,args = getopt.getopt(sys.argv[1:], "aphvdc:C:f:FVs:", ["purge","help", "version", "debug",\
-                       "clear_autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
+                       "clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
        
        except getopt.GetoptError:
                usage()
@@ -258,6 +270,7 @@ if __name__ == "__main__":
                                sys.exit(2)
                        else:
                                conf_values["DEBUG"]="1"
+                               conf_values["VERBOSE"]="1"
 
                if o in ("-c", "--config"):
                        if len(sys.argv) < 3: