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 8bac838d9c4756903769ba3f7f4559ef0ced819b..35dd14da516bff287163e8b15e938a6076ddf646 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,7 +1,6 @@
 #!/usr/bin/python -OO
 
 # Maintained in full by:
-# Eric Edgar <rocket@gentoo.org>
 # Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@gentoo.org>
 
@@ -9,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5"
+__version__="2.0.6_pre17"
 
 conf_values={}
 
@@ -40,7 +39,7 @@ def usage():
 
 def version():
        print "Catalyst, version "+__version__
-       print "Copyright 2003-2007 Gentoo Foundation"
+       print "Copyright 2003-2008 Gentoo Foundation"
        print "Distributed under the GNU General Public License version 2\n"
 
 def parse_config(myconfig):
@@ -147,6 +146,8 @@ def parse_config(myconfig):
 
        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."
@@ -269,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: