From 84cdfc50da10ff57f896e051b3bfdfa3ae52ffa8 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 22 Mar 2013 11:13:10 -0400 Subject: bcfg2-info: fixed building help message on 2.4 (from Michael Fenn) --- src/sbin/bcfg2-info | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/sbin') diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 5bbe5b43b..cfcc95be2 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -736,10 +736,13 @@ def build_usage(): usage = dict() for attrname in dir(InfoCore): attr = getattr(InfoCore, attrname) - if (hasattr(attr, "__func__") and - attr.__func__.func_name not in cmd_blacklist and - attr.__func__.func_name.startswith("do_") and - attr.__func__.func_doc): + + # shim for python 2.4, __func__ is im_func + funcattr = getattr(attr, "__func__", getattr(attr, "im_func", None)) + if (funcattr != None and + funcattr.func_name not in cmd_blacklist and + funcattr.func_name.startswith("do_") and + funcattr.func_doc): usage[attr.__name__] = re.sub(r'\s+', ' ', attr.__doc__) return "Commands:\n" + "\n".join(usage[k] for k in sorted(usage.keys())) -- cgit v1.2.3-1-g7c22