From: Aaron Bentley <aaron.bentley@utoronto.ca>
Date: Tue, 4 Apr 2006 23:46:25 +0000 (-0400)
Subject: Merge both lines
X-Git-Tag: 1.0.0~204
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2225a378d84f77c3512ee407af1aeb355b463084;p=be.git

Merge both lines
---

2225a378d84f77c3512ee407af1aeb355b463084
diff --cc becommands/help.py
index cae8949,2f37ec2..1402a2a
--- a/becommands/help.py
+++ b/becommands/help.py
@@@ -24,9 -24,14 +24,13 @@@ def execute(args)
      if len(args) > 1:
          raise cmdutil.UserError("Too many arguments.")
      if len(args) == 0:
 -        for name, module in cmdutil.iter_commands():
 -            print "be %s\n     %s" % (name, module.__doc__)
 +        print_command_list()
      else:
-         print cmdutil.help(args[0])
+         try:
+             print cmdutil.help(args[0])
+         except AttributeError:
+             print "No help available"
+     
      return