Rev 4701: (igc) fix for short options in shellcomplete (Benoît Pierre) in file:///home/pqm/archives/thelove/bzr/2.0/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.0/

------------------------------------------------------------
revno: 4701 [merge]
revision-id: pqm at pqm.ubuntu.com-20091106005605-hpz13cboo3otga4x
parent: pqm at pqm.ubuntu.com-20091102233914-2rr7qeatw9myuqgt
parent: ian.clatworthy at canonical.com-20091105234527-f0xj7n44lmeue0jq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.0
timestamp: Fri 2009-11-06 00:56:05 +0000
message:
  (igc) fix for short options in shellcomplete (Benoît Pierre)
modified:
  bzrlib/shellcomplete.py        shellcomplete.py-20050822153127-3be115ff5e70fc39
=== modified file 'bzrlib/shellcomplete.py'
--- a/bzrlib/shellcomplete.py	2009-06-15 11:05:33 +0000
+++ b/bzrlib/shellcomplete.py	2009-11-02 22:24:29 +0000
@@ -47,9 +47,10 @@
 
 def shellcomplete_on_options(options, outfile=None):
     for opt in options:
-        if opt.short_name:
+        short_name = opt.short_name()
+        if short_name:
             outfile.write('"(--%s -%s)"{--%s,-%s}\n'
-                    % (opt.name, opt.short_name(), opt.name, opt.short_name()))
+                    % (opt.name, short_name, opt.name, short_name))
         else:
             outfile.write('--%s\n' % opt.name)