Merge branch 'master' into dev

Conflicts: gondor/__main__.py
eldarion · May 20, 2012 · 9b333fd · 9b333fd
2 parents 9e1b6dd + 93bb081
commit 9b333fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -16,6 +16,7 @@ CHANGELOG
 
  * improved path handling of file argument to database:load
  * fixed formatting of errors when deploying
+ * gondor run no longer needs -- to delimit run options from command options
 
 1.0.5
 =====

diff --git a/gondor/__main__.py b/gondor/__main__.py
@@ -826,7 +826,7 @@ def main():
     # cmd: run
     parser_run = command_parsers.add_parser("run")
     parser_run.add_argument("instance_label", nargs=1)
-    parser_run.add_argument("command_", nargs="+")
+    parser_run.add_argument("command_", nargs=argparse.REMAINDER)
 
     # cmd: delete
     parser_delete = command_parsers.add_parser("delete")