From e048173c6083d0de52977353baafa927f790dd09 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 29 Jan 2012 16:42:54 -0500 Subject: [PATCH] ostbuild: Fix error message for unknown builtin --- src/ostbuild/pyostbuild/builtins.py | 5 ++++- src/ostbuild/pyostbuild/main.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ostbuild/pyostbuild/builtins.py b/src/ostbuild/pyostbuild/builtins.py index ddafbcd4..efd8bfc8 100755 --- a/src/ostbuild/pyostbuild/builtins.py +++ b/src/ostbuild/pyostbuild/builtins.py @@ -47,7 +47,10 @@ def register(builtin): _all_builtins[builtin.name] = builtin def get(name): - return _all_builtins.get(name)() + builtin = _all_builtins.get(name) + if builtin is not None: + return builtin() + return None def get_all(): return _all_builtins.itervalues() diff --git a/src/ostbuild/pyostbuild/main.py b/src/ostbuild/pyostbuild/main.py index 4afb4501..eccf8795 100755 --- a/src/ostbuild/pyostbuild/main.py +++ b/src/ostbuild/pyostbuild/main.py @@ -44,7 +44,7 @@ def main(args): else: builtin = builtins.get(args[0]) if builtin is None: - print "error: Unknown builtin '%s'" % (args[1], ) + print "error: Unknown builtin '%s'" % (args[0], ) return usage(1) return builtin.execute(args[1:])