EnDroid

Merge lp:~gingerchris/endroid/helptextfix into lp:endroid

  1. helptextfix
  2. Merge into trunk
Proposed by ChrisD
Status: Merged
Approved by: Martin Morrison
Approved revision: 62
Merged at revision: 60
Proposed branch: lp:~gingerchris/endroid/helptextfix
Merge into: lp:endroid
Prerequisite: lp:~gingerchris/endroid/nonmemberkick
Diff against target: 16 lines (+3/-2)
1 file modified
src/endroid/__init__.py (+3/-2)
To merge this branch: bzr merge lp:~gingerchris/endroid/helptextfix
Reviewer Review Type Date Requested Status
Martin Morrison Approve
Review via email: mp+184295@code.launchpad.net

Commit message

Stop argparse asserting when trying to generate the help text

Description of the change

Stop argparse asserting when trying to generate the help text

To post a comment you must log in.
Revision history for this message
ChrisD (gingerchris) wrote :

Oh and a fix to the unhandled plugin.

Revision history for this message
Martin Morrison (isoschiz) :
review: Approve
Revision history for this message
Martin Morrison (isoschiz) wrote :

The prerequisite lp:~gingerchris/endroid/nonmemberkick has not yet been merged into lp:endroid.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/endroid/__init__.py'
2--- src/endroid/__init__.py 2013-08-30 15:35:53 +0000
3+++ src/endroid/__init__.py 2013-09-06 13:38:16 +0000
4@@ -179,9 +179,10 @@
5 parser.add_argument("-t", "--logtraffic", action='store_true',
6 help="Additionally log all traffic.")
7 parser.add_argument("-m", "--manhole", const=True, nargs='?',
8- metavar="[user][@host][:port]",
9+ metavar="user@host:port",
10 help="Login name, host and port for ssh access. "
11- "Any (or none) of the 3 parts can be specified.")
12+ "Any (or none) of the 3 parts can be specified "
13+ "as follows: [user][@host][:port]")
14 args = parser.parse_args(args)
15
16 cmd = args.config

Subscribers

People subscribed via source and target branches