From b4279ce5a7d31fff6ec379baf8bc74732c507c7b Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Fri, 3 Nov 2006 21:41:34 +0000 Subject: [PATCH] Changed the options to be in alphabetical order so my meatspace logical parser can process them better, added the compress and tarball options, which are as of yet unused for bug #139390 and request from Tim Yamin, and removed the unused -x command line parameter for bug #151405. git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1182 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 64 +++++++++++++++++++++++++++++++------------------------ 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e007f4f..afa00701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.664 2006/10/02 20:41:53 wolf31o2 Exp $ + 03 Nov 2006; Chris Gianelloni catalyst: + Changed the options to be in alphabetical order so my meatspace logical + parser can process them better, added the compress and tarball options, + which are as of yet unused for bug #139390 and request from Tim Yamin, and + removed the unused -x command line parameter for bug #151405. + 03 Nov 2006; Chris Gianelloni modules/generic_stage_target.py: Added a warning about changing the CHOST setting for bug #142034. diff --git a/catalyst b/catalyst index ffd8b7f2..0a237c7a 100755 --- a/catalyst +++ b/catalyst @@ -93,53 +93,61 @@ def parse_config(myconfig): conf_values[x]=confdefaults[x] # 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 "pkgcache" in string.split(conf_values["options"]): - print "Package cache support enabled." - conf_values["PKGCACHE"]="1" - - if "snapcache" in string.split(conf_values["options"]): - print "Snapshot cache support enabled." - conf_values["SNAPCACHE"]="1" - - if "seedcache" in string.split(conf_values["options"]): - print "Seed cache support enabled." - conf_values["SEEDCACHE"]="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 "kerncache" in string.split(conf_values["options"]): - print "Kernel cache support enabled." - conf_values["KERNCACHE"]="1" - if "distcc" in string.split(conf_values["options"]): print "Distcc support enabled." conf_values["DISTCC"]="1" - if "autoresume" in string.split(conf_values["options"]): - print "Autoresuming support enabled." - conf_values["AUTORESUME"]="1" + if "kerncache" in string.split(conf_values["options"]): + print "Kernel cache support enabled." + conf_values["KERNCACHE"]="1" + + if "pkgcache" in string.split(conf_values["options"]): + print "Package cache support enabled." + conf_values["PKGCACHE"]="1" if "purge" in string.split(conf_values["options"]): print "Purge support enabled." conf_values["PURGE"]="1" - - if "clear-autoresume" in string.split(conf_values["options"]): - print "Cleaning autoresume flags support enabled." - conf_values["CLEAR_AUTORESUME"]="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 "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("envscript"): print "Envscript support enabled." conf_values["ENVSCRIPT"]=myconf["envscript"] - - if myconf.has_key("digests"): - conf_values["digests"]=myconf["digests"] def import_modules(): # import catalyst's own modules (i.e. catalyst_support and the arch modules) targetmap={} - + try: for x in required_build_targets: try: @@ -213,7 +221,7 @@ if __name__ == "__main__": # parse out the command line arguments try: - opts,args = getopt.getopt(sys.argv[1:], "apxhvdc:C:f:FVs:", ["purge","help", "version", "debug",\ + opts,args = getopt.getopt(sys.argv[1:], "aphvdc:C:f:FVs:", ["purge","help", "version", "debug",\ "clear_autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="]) except getopt.GetoptError: -- 2.26.2