import os,sys,imp,string,getopt
import pdb
+sys.path.append("./modules")
+
+import catalyst
+
__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre2"
+__version__="2.0.6"
conf_values={}
def version():
print "Catalyst, version "+__version__
- print "Copyright 2003-2007 Gentoo Foundation"
- print "Distributed under the GNU General Public License version 2\n"
+ 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
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)
sys.exit(2)
else:
conf_values["DEBUG"]="1"
+ conf_values["VERBOSE"]="1"
if o in ("-c", "--config"):
if len(sys.argv) < 3:
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))