Rename version() to show_version()

diff --git a/ChangeLog b/ChangeLog
index e3c64dbbd5af2dd85e6fb341a5196f6c46f0798b..47271d204d998b0a354bc5ce3cbbe5a5805ac760 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst:
+  Rename version() to show_version()
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst:
   Remove import_modules()
 

diff --git a/catalyst b/catalyst
index 33827836a686875b85e6fa1e73456675b2b6c877..7c625676ec9b3d20f1e34862a1367f5820d61d2f 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -47,7 +47,7 @@ def usage():
        print "Using the specfile option (-f, --file) to build a stage target:"
        print "catalyst -f stage1-specfile.spec"
 
-def version():
+def show_version():
        print "Catalyst, version "+__version__
        print "Copyright 2003-2008 Gentoo Foundation"
        print "Copyright 2008 various authors"
@@ -181,9 +181,8 @@ def build_target(addlargs, targetmap):
                sys.exit(1)
 
 if __name__ == "__main__":
-       targetmap={}
        
-       version()
+       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"