# Maintained in full by:
# Andrew Gaffney <agaffney@gentoo.org>
-# Chris Gianelloni <wolf31o2@gentoo.org>
+# Chris Gianelloni <wolf31o2@wolf31o2.org>
+# $Id$
-import os,sys,imp,string,getopt
+import os, sys, imp, string, getopt
import pdb
+import os.path
-__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6_pre6"
+__selfpath__ = os.path.abspath(os.path.dirname(__file__))
+
+sys.path.append(__selfpath__ + "/modules")
+
+import catalyst.config
+import catalyst.util
+
+__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
+__version__="2.0.6.916"
conf_values={}
def usage():
print "Usage catalyst [options] [-C variable=value...] [ -s identifier]"
print " -a --clear-autoresume clear autoresume flags"
- print " -c --config use specified configuration file"
- print " -C --cli catalyst commandline (MUST BE LAST OPTION)"
- print " -d --debug enable debugging"
- print " -f --file read specfile"
- 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 release snapshot"
- print " -V --version display version information"
- print " -v --verbose verbose output"
+ print " -c --config use specified configuration file"
+ print " -C --cli catalyst commandline (MUST BE LAST OPTION)"
+ print " -d --debug enable debugging"
+ print " -f --file read specfile"
+ 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 " -P --purgeonly clear tmp dirs,package cache and autoresume flags and exit"
+ print " -s --snapshot generate a release snapshot"
+ print " -V --version display version information"
+ print " -v --verbose verbose output"
print
print "Usage examples:"
print
def version():
print "Catalyst, version "+__version__
print "Copyright 2003-2008 Gentoo Foundation"
- print "Distributed under the GNU General Public License version 2\n"
+ print "Copyright 2008-2011 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
# now, try and parse the config file "config_file"
try:
- execfile(config_file, myconf, myconf)
+# execfile(config_file, myconf, myconf)
+ myconfig = catalyst.config.ConfigParser(config_file)
+ myconf.update(myconfig.get_values())
except:
print "!!! catalyst: Unable to parse configuration file, "+myconfig
fh=open(conf_values["sharedir"]+"/modules/"+x+".py")
module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE))
fh.close()
-
+
except IOError:
raise CatalystError,"Can't find "+x+".py plugin in "+\
conf_values.settings["sharedir"]+"/modules/"
module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE))
module.register(targetmap)
fh.close()
-
+
except IOError:
raise CatalystError,"Can't find "+x+".py plugin in "+\
conf_values.settings["sharedir"]+"/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)
-
- except CatalystError:
- print "!!! catalyst: Could not parse commandline, exiting."
- sys.exit(1)
-
def build_target(addlargs, targetmap):
try:
if not targetmap.has_key(addlargs["target"]):
mytarget.run()
except:
- # TODO: Capture traceback, so we can display this error after printing of the traceback
+ catalyst.util.print_traceback()
print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
- raise
+ sys.exit(1)
if __name__ == "__main__":
targetmap={}
# parse out the command line arguments
try:
- opts,args = getopt.getopt(sys.argv[1:], "aphvdc:C:f:FVs:", ["purge","help", "version", "debug",\
+ opts,args = getopt.getopt(sys.argv[1:], "apPhvdc:C:f:FVs:", ["purge", "purgeonly", "help", "version", "debug",\
"clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="])
except getopt.GetoptError:
print "!!! catalyst: please specify one of either -f or -C\n"
usage()
sys.exit(2)
- run=0
+
+ run = False
for o, a in opts:
if o in ("-h", "--help"):
usage()
sys.exit(1)
if o in ("-d", "--debug"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- conf_values["DEBUG"]="1"
+ conf_values["DEBUG"]="1"
+ conf_values["VERBOSE"]="1"
if o in ("-c", "--config"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- myconfig=a
+ myconfig=a
if o in ("-C", "--cli"):
- run=1
+ run = True
x=sys.argv.index(o)+1
while x < len(sys.argv):
mycmdline.append(sys.argv[x])
x=x+1
if o in ("-f", "--file"):
- run=1
+ run = True
myspecfile=a
if o in ("-F", "--fetchonly"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- conf_values["FETCH"]="1"
+ conf_values["FETCH"]="1"
if o in ("-v", "--verbose"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- conf_values["VERBOSE"]="1"
+ conf_values["VERBOSE"]="1"
if o in ("-s", "--snapshot"):
if len(sys.argv) < 3:
usage()
sys.exit(2)
else:
- run=1
+ run = True
mycmdline.append("target=snapshot")
mycmdline.append("version_stamp="+a)
if o in ("-p", "--purge"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- conf_values["PURGE"]="1"
+ conf_values["PURGE"] = "1"
+
+ if o in ("-P", "--purgeonly"):
+ conf_values["PURGEONLY"] = "1"
+
if o in ("-a", "--clear-autoresume"):
- if len(sys.argv) < 3:
- print "!!! catalyst: please specify one of either -f or -C\n"
- usage()
- sys.exit(2)
- else:
- conf_values["CLEAR_AUTORESUME"]="1"
- if run != 1:
+ conf_values["CLEAR_AUTORESUME"] = "1"
+
+ if not run:
print "!!! catalyst: please specify one of either -f or -C\n"
usage()
sys.exit(2)
sys.path.append(conf_values["sharedir"]+"/modules")
from catalyst_support import *
- # Start checking that digests are valid now that the hash_map was imported from catalyst_support
+ # Start checking that digests are valid now that the hash_map was imported
+ # from catalyst_support
if conf_values.has_key("digests"):
for i in conf_values["digests"].split():
if not hash_map.has_key(i):
if conf_values.has_key("hash_function"):
if not hash_map.has_key(conf_values["hash_function"]):
print
- print conf_values["hash_function"]+" is not a valid hash_function entry"
+ print conf_values["hash_function"]+\
+ " is not a valid hash_function entry"
print "Valid hash_function entries:"
print hash_map.keys()
print
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))
-
+ try:
+ cmdline = catalyst.config.ConfigParser()
+ cmdline.parse_lines(mycmdline)
+ addlargs.update(cmdline.get_values())
+ except CatalystError:
+ print "!!! catalyst: Could not parse commandline, exiting."
+ sys.exit(1)
+
if not addlargs.has_key("target"):
raise CatalystError, "Required value \"target\" not specified."
projects / catalyst.git / blobdiff