# 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 pdb
-import os.path
+import os, sys, getopt
+# This assumes that our modules are in a sub-dir named "modules" in the
+# directory that the main catalyst binary is in
__selfpath__ = os.path.abspath(os.path.dirname(__file__))
-
sys.path.append(__selfpath__ + "/modules")
-import catalyst.config
-import catalyst.util
-import catalyst.target
-from catalyst.support import *
+import catalyst
+from catalyst.output import *
+from catalyst.error import *
+from catalyst.hash import hash_map
-__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
+__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
__version__="2.99"
-conf_values={}
+conf_values = {}
+config = catalyst.config.config()
def usage():
print "Usage catalyst [options] [-C variable=value...] [ -s identifier]"
print "catalyst -f stage1-specfile.spec"
def show_version():
- 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"
+ msg("Catalyst, version " + __version__)
+ msg("Copyright 2003-2008 Gentoo Foundation")
+ msg("Copyright 2008 various authors")
+ msg("Distributed under the GNU General Public License version 2.1")
-def parse_config(myconfig):
+def parse_config():
# search a couple of different areas for the main config file
- myconf={}
- config_file=""
-
- confdefaults={ "storedir":"/var/tmp/catalyst",\
- "sharedir":"/usr/share/catalyst","distdir":"/usr/portage/distfiles",\
- "portdir":"/usr/portage","options":"",\
- "snapshot_cache":"/var/tmp/catalyst/snapshot_cache",\
- "hash_function":"crc32"}
-
- # first, try the one passed (presumably from the cmdline)
- if myconfig:
- if os.path.exists(myconfig):
- print "Using command line specified Catalyst configuration file, "+myconfig
- config_file=myconfig
+ myconf = {}
+
+ confdefaults = {
+ "storedir": "/var/tmp/catalyst",
+ "sharedir": "/usr/share/catalyst",
+ "distdir": "/usr/portage/distfiles",
+ "portdir": "/usr/portage",
+ "options": "",
+ "snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
+ "hash_function": "crc32"
+ }
+ # first, try the one passed (presumably from the cmdline)
+ if "config_file" in conf_values:
+ if os.path.exists(conf_values["config_file"]):
+ msg("Using command line specified Catalyst configuration file, " + conf_values["config_file"])
else:
- print "!!! catalyst: Could not use specified configuration file "+\
- myconfig
- sys.exit(1)
-
+ die("specified configuration file " + conf_values["config_file"] + " does not exist")
+
# next, try the default location
elif os.path.exists("/etc/catalyst/catalyst.conf"):
- print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf"
- config_file="/etc/catalyst/catalyst.conf"
-
+ msg("Using default Catalyst configuration file, /etc/catalyst/catalyst.conf")
+ conf_values["config_file"] = "/etc/catalyst/catalyst.conf"
+
# can't find a config file (we are screwed), so bail out
else:
- print "!!! catalyst: Could not find a suitable configuration file"
- sys.exit(1)
+ die("Could not find a suitable configuration file")
+
+ # Load the default config values into myconf
+ for x in confdefaults:
+ msg("Setting " + x + " to default value '" + confdefaults[x] + "'")
+ myconf[x] = confdefaults[x]
# now, try and parse the config file "config_file"
try:
-# execfile(config_file, myconf, myconf)
- myconfig = catalyst.config.ConfigParser(config_file)
+ myconfig = catalyst.config.ConfigParser(conf_values["config_file"])
myconf.update(myconfig.get_values())
-
+
except:
- print "!!! catalyst: Unable to parse configuration file, "+myconfig
- sys.exit(1)
-
+ die("Unable to parse configuration file, " + conf_values["config_file"])
+
# now, load up the values into conf_values so that we can use them
for x in confdefaults.keys():
- if myconf.has_key(x):
- print "Setting",x,"to config file value \""+myconf[x]+"\""
- conf_values[x]=myconf[x]
+ if x in myconf:
+ msg("Setting " + x + " to config file value '" + myconf[x] + "'")
+ conf_values[x] = myconf[x]
else:
- print "Setting",x,"to default value \""+confdefaults[x]+"\""
- conf_values[x]=confdefaults[x]
+ msg("Setting " + x + " to default value '" + confdefaults[x] + "'")
+ conf_values[x] = confdefaults[x]
+
+ options = (
+ ("autoresume", "AUTORESUME", "Autoresuming support enabled."),
+ ("ccache", "CCACHE", "Compiler cache support enabled."),
+ ("clear-autoresume", "CLEAR_AUTORESUME", "Cleaning autoresume flags support enabled"),
+# ("compress", "COMPRESS", "Compression enabled."),
+ ("distcc", "DISTCC", "Distcc support enabled."),
+ ("icecream", "ICECREAM", "Icecream compiler cluster support enabled."),
+ ("kerncache", "KERNCACHE", "Kernel cache support enabled."),
+ ("pkgcache", "PKGCACHE", "Package cache support enabled."),
+ ("purge", "PURGE", "Purge support enabled."),
+ ("seedcache", "SEEDCACHE", "Seed cache support enabled."),
+ ("snapcache", "SNAPCACHE", "Snapshot cache support enabled."),
+# ("tarball", "TARBALL", "Tarball creation enabled.")
+ )
+
+ split_options = conf_values["options"].split()
# parse out the rest of the options from the config file
- if "autoresume" in string.split(conf_values["options"]):
- print "Autoresuming support enabled."
- conf_values["AUTORESUME"]="1"
-
- if "ccache" in string.split(conf_values["options"]):
- print "Compiler cache support enabled."
- conf_values["CCACHE"]="1"
-
- if "clear-autoresume" in string.split(conf_values["options"]):
- print "Cleaning autoresume flags support enabled."
- conf_values["CLEAR_AUTORESUME"]="1"
-
-# if "compress" in string.split(conf_values["options"]):
-# print "Compression enabled."
-# conf_values["COMPRESS"]="1"
-
- if "distcc" in string.split(conf_values["options"]):
- print "Distcc support enabled."
- conf_values["DISTCC"]="1"
+ for x in options:
+ if x[0] in split_options:
+ msg(x[2])
+ conf_values[x[1]] = "1"
- if "icecream" in string.split(conf_values["options"]):
- print "Icecream compiler cluster support enabled."
- conf_values["ICECREAM"]="1"
+ if "digests" in myconf:
+ conf_values["digests"] = myconf["digests"]
- if "kerncache" in string.split(conf_values["options"]):
- print "Kernel cache support enabled."
- conf_values["KERNCACHE"]="1"
+ if "contents" in myconf:
+ conf_values["contents"] = myconf["contents"]
- if "pkgcache" in string.split(conf_values["options"]):
- print "Package cache support enabled."
- conf_values["PKGCACHE"]="1"
+ if "envscript" in myconf:
+ msg("Envscript support enabled.")
+ conf_values["ENVSCRIPT"] = myconf["envscript"]
- if "purge" in string.split(conf_values["options"]):
- print "Purge support enabled."
- conf_values["PURGE"]="1"
-
- if "seedcache" in string.split(conf_values["options"]):
- print "Seed cache support enabled."
- conf_values["SEEDCACHE"]="1"
-
- if "snapcache" in string.split(conf_values["options"]):
- 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."
- conf_values["ENVSCRIPT"]=myconf["envscript"]
-
-def build_target(addlargs, targetmap):
- try:
- if not targetmap.has_key(addlargs["target"]):
- raise CatalystError,"Target \""+addlargs["target"]+"\" not available."
-
- mytarget=targetmap[addlargs["target"]](conf_values, addlargs)
-
- mytarget.run()
-
- except:
- catalyst.util.print_traceback()
- print "!!! catalyst: Error encountered during run of target " + addlargs["target"]
-# sys.exit(1)
- raise
-
-def verify_digest_and_hash_functions(conf_values):
+def verify_digest_and_hash_functions():
# Start checking that digests are valid now that the hash_map was imported from catalyst_support
- if conf_values.has_key("digests"):
+ if "digests" in conf_values:
for i in conf_values["digests"].split():
- if not hash_map.has_key(i):
- print
- print i+" is not a valid digest entry"
- print "Valid digest entries:"
- print hash_map.keys()
- print
- print "Catalyst aborting...."
+ if not i in hash_map:
+ msg()
+ msg(i + " is not a valid digest entry")
+ msg("Valid digest entries:")
+ msg("\n".join(hash_map.keys()))
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
- if find_binary(hash_map[i][1]) == None:
- print
- print "digest="+i
- print "\tThe "+hash_map[i][1]+\
- " binary was not found. It needs to be in your system path"
- print
- print "Catalyst aborting...."
+ if catalyst.util.find_binary(hash_map[i][1]) == None:
+ msg()
+ msg("digest=" + i)
+ msg("\tThe " + hash_map[i][1] + \
+ " binary was not found. It needs to be in your system path")
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
- 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 "Valid hash_function entries:"
- print hash_map.keys()
- print
- print "Catalyst aborting...."
+ if "hash_function" in conf_values:
+ if not conf_values["hash_function"] in hash_map:
+ msg()
+ msg(conf_values["hash_function"] + " is not a valid hash_function entry")
+ msg("Valid hash_function entries:")
+ msg("\n".join(hash_map.keys()))
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
- if find_binary(hash_map[conf_values["hash_function"]][1]) == None:
- print
- print "hash_function="+conf_values["hash_function"]
- print "\tThe "+hash_map[conf_values["hash_function"]][1]+\
- " binary was not found. It needs to be in your system path"
- print
- print "Catalyst aborting...."
+ if catalyst.util.find_binary(hash_map[conf_values["hash_function"]][1]) == None:
+ msg()
+ msg("hash_function=" + conf_values["hash_function"])
+ msg("\tThe " + hash_map[conf_values["hash_function"]][1] + \
+ " binary was not found. It needs to be in your system path")
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
-
-if __name__ == "__main__":
-
- show_version()
-
- if os.getuid() != 0:
- # catalyst cannot be run as a normal user due to chroots, mounts, etc
- print "!!! catalyst: This script requires root privileges to operate"
- sys.exit(2)
-
+def parse_commandline():
# parse out the command line arguments
try:
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:
usage()
sys.exit(2)
-
+
# defaults for commandline opts
- debug=False
- verbose=False
- fetch=False
- myconfig=""
- myspecfile=""
- mycmdline=[]
- myopts=[]
+ conf_values["command_line"] = []
# check preconditions
if len(opts) == 0:
- print "!!! catalyst: please specify one of either -f or -C\n"
+ warn("please specify one of either -f or -C\n")
usage()
sys.exit(2)
if o in ("-h", "--help"):
usage()
sys.exit(1)
-
+
if o in ("-V", "--version"):
- print "Catalyst version "+__version__
+ show_version()
sys.exit(1)
if o in ("-d", "--debug"):
conf_values["VERBOSE"]="1"
if o in ("-c", "--config"):
- myconfig=a
+ conf_values["config_file"] = a
if o in ("-C", "--cli"):
run = True
- x=sys.argv.index(o)+1
+ x = sys.argv.index(o) + 1
while x < len(sys.argv):
- mycmdline.append(sys.argv[x])
- x=x+1
-
+ conf_values["command_line"].append(sys.argv[x])
+ x = x + 1
+
if o in ("-f", "--file"):
run = True
- myspecfile=a
+ conf_values["spec_file"] = a
if o in ("-F", "--fetchonly"):
- conf_values["FETCH"]="1"
-
+ conf_values["FETCH"] = "1"
+
if o in ("-v", "--verbose"):
- conf_values["VERBOSE"]="1"
+ conf_values["VERBOSE"] = "1"
if o in ("-s", "--snapshot"):
if len(sys.argv) < 3:
- print "!!! catalyst: missing snapshot identifier\n"
+ warn("missing snapshot identifier")
usage()
sys.exit(2)
else:
run = True
- mycmdline.append("target=snapshot")
- mycmdline.append("version_stamp="+a)
-
+ conf_values["command_line"].append("target=snapshot")
+ conf_values["command_line"].append("version_stamp="+a)
+
if o in ("-p", "--purge"):
conf_values["PURGE"] = "1"
conf_values["CLEAR_AUTORESUME"] = "1"
if not run:
- print "!!! catalyst: please specify one of either -f or -C\n"
+ warn("please specify one of either -f or -C")
usage()
sys.exit(2)
- parse_config(myconfig)
-
- verify_digest_and_hash_functions(conf_values)
+if __name__ == "__main__":
+
+ show_version()
+
+ if os.getuid() != 0:
+ # catalyst cannot be run as a normal user due to chroots, mounts, etc
+ die("This script requires root privileges to operate", 2)
+
+ parse_commandline()
+
+ parse_config()
+
+ verify_digest_and_hash_functions()
targetmap = catalyst.target.build_target_map()
+ spec = catalyst.config.Spec()
- addlargs={}
-
- if myspecfile:
- spec = catalyst.config.SpecParser(myspecfile)
- addlargs.update(spec.get_values())
-
- if mycmdline:
+ if "spec_file" in conf_values:
+ specparser = catalyst.config.SpecParser(conf_values["spec_file"])
+ spec_values = specparser.get_values()
+ spec.parse_values(spec_values)
+
+ if "command_line" in conf_values:
try:
cmdline = catalyst.config.ConfigParser()
- cmdline.parse_lines(mycmdline)
- addlargs.update(cmdline.get_values())
+ cmdline.parse_lines(conf_values["command_line"])
+ cmdline_values = cmdline.get_values()
+ spec.parse_values(cmdline_values)
except CatalystError:
- print "!!! catalyst: Could not parse commandline, exiting."
- sys.exit(1)
+ die("Could not parse commandline, exiting.")
- if not addlargs.has_key("target"):
- raise CatalystError, "Required value \"target\" not specified."
+ config.set_spec(spec)
+ config.set_conf(conf_values)
+ config.set_targetmap(targetmap)
# everything is setup, so the build is a go
try:
- build_target(addlargs, targetmap)
-
+ catalyst.target.build_targets()
+
except CatalystError:
- print
- print "Catalyst aborting...."
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
except KeyboardInterrupt:
- print "\nCatalyst build aborted due to user interrupt ( Ctrl-C )"
- print
- print "Catalyst aborting...."
+ msg()
+ msg("Catalyst build aborted due to user interrupt ( Ctrl-C )")
+ msg()
+ msg("Catalyst aborting....")
sys.exit(2)
except LockInUse:
- print "Catalyst aborting...."
+ msg("Catalyst aborting....")
sys.exit(2)
except:
- print "Catalyst aborting...."
+ msg("Catalyst aborting....")
raise
sys.exit(2)