Fix ARM hardfloat
[catalyst.git] / catalyst
index c8b0a07d80bca905df413708dbb1c036a3d23b9d..8be5dab88f9ce494e912563231e8f561f461159d 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -2,34 +2,39 @@
 
 # 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
 
-sys.path.append("./modules")
+__selfpath__ = os.path.abspath(os.path.dirname(__file__))
+
+sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
 
-__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.6"
+__maintainer__="Chris Gianelloni <wolf31o2@wolf31o2.org>"
+__version__="2.0.6.912"
 
 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
@@ -45,7 +50,7 @@ def usage():
 def version():
        print "Catalyst, version "+__version__
        print "Copyright 2003-2008 Gentoo Foundation"
-       print "Copyright 2008 various authors"
+       print "Copyright 2008-2010 various authors"
        print "Distributed under the GNU General Public License version 2.1\n"
 
 def parse_config(myconfig):
@@ -171,7 +176,7 @@ def import_modules():
                                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/"
@@ -182,7 +187,7 @@ def import_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/"
@@ -224,7 +229,7 @@ if __name__ == "__main__":
 
        # 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:
@@ -245,7 +250,8 @@ if __name__ == "__main__":
                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()
@@ -256,48 +262,28 @@ if __name__ == "__main__":
                        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["VERBOSE"]="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:
@@ -305,25 +291,20 @@ if __name__ == "__main__":
                                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)
@@ -333,7 +314,8 @@ if __name__ == "__main__":
        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):
@@ -355,7 +337,8 @@ if __name__ == "__main__":
        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