More indecisiveness..move util.spec to config.SpecParser

[catalyst.git] / catalyst

diff --git a/catalyst b/catalyst
index 1fb6c55cfa73eab25ab05140ccfa960c875476ac..518a82e281a82a4f6d4c2f0d65e1bb1ea430adb5 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -1,15 +1,18 @@
 #!/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
 
+sys.path.append("./modules")
+
+import catalyst
+
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.5_pre6"
+__version__="2.0.6"
 
 conf_values={}
 
@@ -23,7 +26,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
@@ -32,16 +35,17 @@ 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-2007 Gentoo Foundation"
-       print "Distributed under the GNU General Public License version 2\n"
+       print "Catalyst, version "+__version__
+       print "Copyright 2003-2008 Gentoo Foundation"
+       print "Copyright 2008 various authors"
+       print "Distributed under the GNU General Public License version 2.1\n"
 
 def parse_config(myconfig):
        # search a couple of different areas for the main config file
@@ -147,6 +151,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."
@@ -185,14 +191,6 @@ def import_modules():
 
        return targetmap
 
-def do_spec(myspecfile):
-       try:
-               addlargs=read_spec(myspecfile)
-       except:
-               sys.exit(1)
-               
-       return addlargs
-
 def do_cli(cmdline):
        try:
                return arg_parse(cmdline)
@@ -269,6 +267,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:
@@ -382,7 +381,8 @@ if __name__ == "__main__":
        addlargs={}
        
        if myspecfile:
-               addlargs.update(do_spec(myspecfile))
+               spec = catalyst.config.SpecParser(myspecfile)
+               addlargs.update(spec.get_values())
        
        if mycmdline:
                addlargs.update(do_cli(mycmdline))