You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by mc...@apache.org on 2014/04/04 01:25:29 UTC

git commit: Fix two clientv2 command-line bugs.

Repository: incubator-aurora
Updated Branches:
  refs/heads/master 8262c8b62 -> 8846655e8


Fix two clientv2 command-line bugs.

- Clientv2 bridge would crash and dump cookies if you didn't give it
  any command-line parameters.
- Clientv2 help formatting was messed up.

Bugs closed: aurora-307

Reviewed at https://reviews.apache.org/r/20010/


Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/8846655e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/8846655e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/8846655e

Branch: refs/heads/master
Commit: 8846655e8ae1dfcec79a9b793393c3c3295c9ebe
Parents: 8262c8b
Author: Mark Chu-Carroll <mc...@twopensource.com>
Authored: Thu Apr 3 19:23:47 2014 -0400
Committer: Mark Chu-Carroll <mc...@twitter.com>
Committed: Thu Apr 3 19:23:47 2014 -0400

----------------------------------------------------------------------
 src/main/python/apache/aurora/client/cli/__init__.py | 2 +-
 src/main/python/apache/aurora/client/cli/bridge.py   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8846655e/src/main/python/apache/aurora/client/cli/__init__.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/__init__.py b/src/main/python/apache/aurora/client/cli/__init__.py
index a1063e1..f1165a0 100644
--- a/src/main/python/apache/aurora/client/cli/__init__.py
+++ b/src/main/python/apache/aurora/client/cli/__init__.py
@@ -343,7 +343,7 @@ class Noun(AuroraCommand):
 
   @property
   def usage(self):
-    return ["%s %s" % (self.name, ' '.join(self.verbs[verb].usage)) for verb in self.verbs]
+    return ["%s %s" % (self.name, self.verbs[verb].usage) for verb in self.verbs]
 
   @classmethod
   def create_context(cls):

http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/8846655e/src/main/python/apache/aurora/client/cli/bridge.py
----------------------------------------------------------------------
diff --git a/src/main/python/apache/aurora/client/cli/bridge.py b/src/main/python/apache/aurora/client/cli/bridge.py
index 37964b6..30f1718 100644
--- a/src/main/python/apache/aurora/client/cli/bridge.py
+++ b/src/main/python/apache/aurora/client/cli/bridge.py
@@ -80,6 +80,8 @@ class Bridge(object):
 
   def execute(self, args):
     """Dispatch a command line to the appropriate CommandProcessor"""
+    if len(args) == 1:
+      args.append('help')
     for cl in self.command_processors:
       if args[1] == 'help':
         self.show_help(args)