From 6c6c75d75a07b974733c823ea1ec593969672d50 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 10 Jan 2009 21:01:49 -0600 Subject: [PATCH] Rename version() to show_version() --- ChangeLog | 3 +++ catalyst | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3c64dbb..47271d20 100644 --- 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 catalyst: + Rename version() to show_version() + 11 Jan 2009; Andrew Gaffney catalyst: Remove import_modules() diff --git a/catalyst b/catalyst index 33827836..7c625676 100755 --- 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" -- 2.26.2