Apport

Merge lp:~gothicx/apport/remove_online_word into lp:~apport-hackers/apport/trunk

  1. remove_online_word
  2. Merge into trunk
Proposed by Marco Rodrigues
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gothicx/apport/remove_online_word
Merge into: lp:~apport-hackers/apport/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~gothicx/apport/remove_online_word
Reviewer Review Type Date Requested Status
Apport upstream developers Pending
Review via email: mp+11687@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/apport-retrace'
2--- bin/apport-retrace 2009-09-08 12:03:44 +0000
3+++ bin/apport-retrace 2009-09-09 11:19:26 +0000
4@@ -75,11 +75,11 @@
5 (opts, args) = optparser.parse_args()
6
7 if len(args) != 1:
8- optparser.error(_('incorrect number of arguments; use --help for a short online help'))
9+ optparser.error(_('incorrect number of arguments; use --help for a short help'))
10 sys.exit(1)
11
12 if not (opts.auth_file or opts.output or opts.stdout or opts.gdb):
13- optparser.error(_('you either need to do a local operation (-s, -g, -o) or supply an authentication file (--auth); see --help for a short online help'))
14+ optparser.error(_('you either need to do a local operation (-s, -g, -o) or supply an authentication file (--auth); see --help for a short help'))
15 sys.exit(1)
16
17 return (args[0], opts)
18
19=== modified file 'bin/dupdb-admin'
20--- bin/dupdb-admin 2009-01-26 14:00:59 +0000
21+++ bin/dupdb-admin 2009-09-09 11:19:26 +0000
22@@ -39,7 +39,7 @@
23 '''Change the master ID of a crash.'''
24
25 if len(args) != 2:
26- print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short online help)'
27+ print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short help)'
28 sys.exit(1)
29 (oldid, newid) = args
30
31@@ -73,7 +73,7 @@
32 try:
33 command = globals()['command_' + args.pop(0)]
34 except KeyError:
35- print >> sys.stderr, 'unknown command (use --help for a short online help)'
36+ print >> sys.stderr, 'unknown command (use --help for a short help)'
37 sys.exit(1)
38 command(crashdb, options, args)
39
40
41=== modified file 'man/apport-retrace.1'
42--- man/apport-retrace.1 2009-04-06 23:02:04 +0000
43+++ man/apport-retrace.1 2009-09-09 11:19:26 +0000
44@@ -84,7 +84,7 @@
45
46 .TP
47 .B \-h, \-\-help
48-Print a short online help that documents all options.
49+Print a short help that documents all options.
50
51 .TP
52 .B \-\-auth=\fIauthfile

Subscribers

People subscribed via source and target branches