# HG changeset patch
# User Dmitriy Morozov <dmitriy@mrzv.org>
# Date 1289070880 25200
# Node ID b072cb473b4746692d51cd30e2e891ea43728e23
# Parent  76334dcc9ae4d0d461c40b750aa7ee345655bbbd# Parent  7064f90734010c675130a19899739dd4b8d4391a
Merged upstream

diff -r 7064f9073401 -r b072cb473b47 opster.py
--- a/opster.py	Tue Nov 02 13:38:19 2010 +0100
+++ b/opster.py	Sat Nov 06 12:14:40 2010 -0700
@@ -543,10 +543,14 @@
         print ' '.join(filter(lambda x: x.startswith(current), commands))
 
     # command options
-    elif cwords[0] in commands:
+    else:
+        try:
+            aliases, (cmd, opts, usage) = findcmd(cwords[0], cmdtable)
+        except AmbiguousCommand:
+            sys.exit(1) 
+
         idx = -2 if current else -1
         options = []
-        aliases, (cmd, opts, usage) = findcmd(cwords[0], cmdtable)
 
         for o in opts:
             short, long, default, help = o[:4]
@@ -571,6 +575,7 @@
     COMPREPLY=( $( COMP_WORDS="${COMP_WORDS[*]}" \\
                    COMP_CWORD=$COMP_CWORD \\
                    OPSTER_AUTO_COMPLETE=1 $1 ) )
+    COMP_WORDBREAKS=${COMP_WORDBREAKS//:}
 }
 complete -o default -F _opster_completion %s
 # opster bash completion end