[ostree] ostbuild: Fix error message for unknown builtin
- From: Colin Walters <walters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] ostbuild: Fix error message for unknown builtin
- Date: Sun, 29 Jan 2012 21:47:58 +0000 (UTC)
commit e048173c6083d0de52977353baafa927f790dd09
Author: Colin Walters <walters verbum org>
Date: Sun Jan 29 16:42:54 2012 -0500
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 ddafbcd..efd8bfc 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 4afb450..eccf879 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:])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]