Clean up a few extraneous spaces, line wrap a comment, and add Id.

diff --git a/ChangeLog b/ChangeLog
index 12670bba35204abf02769ac6da9319e3a1a74bc3..8d1f62c334758fd4fc4b1d4a08fbb3739a599d82 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 # Distributed under the GPL v2
 # $Id$
 
+  02 Sep 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> catalyst:
+  Clean up a few extraneous spaces, line wrap a comment, and add Id.
+
   02 Sep 2009; Chris Gianelloni <wolf31o2@wolf31o2.org> AUTHORS,
   +.gitattributes, README, TODO:
   Adding .gitattributes and adding an Id variable to AUTHORS, ChangeLog,

diff --git a/catalyst b/catalyst
index 82b4dc92df2358601ffa12be6d955f5b9021da60..1962dec04eb442470d84f332c7897b01c87c4d53 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -3,6 +3,7 @@
 # Maintained in full by:
 # Andrew Gaffney <agaffney@gentoo.org>
 # Chris Gianelloni <wolf31o2@wolf31o2.org>
+# $Id$
 
 import os, sys, imp, string, getopt
 import pdb
@@ -49,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-2009 various authors"
        print "Distributed under the GNU General Public License version 2.1\n"
 
 def parse_config(myconfig):
@@ -175,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/"
@@ -186,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/"
@@ -313,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):
@@ -335,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