From b530de2ad55c7ff6982237a9c29219d5cae44742 Mon Sep 17 00:00:00 2001 From: tong li Date: Mon, 18 Mar 2013 09:04:13 -0400 Subject: [PATCH] swift-ring-builder blows up when not supported command requested. swift-ring-builder uses outdated unbounded class method to handle not supported command. It worked for python 2.6 or older but not for python 2.7 or newer. This patch fixes the problem. Change-Id: I7dbc681ef6be44f6d79ff93189ccca13c51eab74 Fixes: bug #1154882 --- bin/swift-ring-builder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/swift-ring-builder b/bin/swift-ring-builder index 0d636f620a..f6ca672e10 100755 --- a/bin/swift-ring-builder +++ b/bin/swift-ring-builder @@ -694,9 +694,9 @@ if __name__ == '__main__': if argv[0].endswith('-safe'): try: with lock_parent_directory(abspath(argv[1]), 15): - Commands.__dict__.get(command, Commands.unknown)() + Commands.__dict__.get(command, Commands.unknown.im_func)() except exceptions.LockTimeout: print "Ring/builder dir currently locked." exit(2) else: - Commands.__dict__.get(command, Commands.unknown)() + Commands.__dict__.get(command, Commands.unknown.im_func)()