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
75
    (opts, args) = optparser.parse_args()
75
    (opts, args) = optparser.parse_args()
6
76
76
7
77
    if len(args) != 1:
77
    if len(args) != 1:
9
78
        optparser.error(_('incorrect number of arguments; use --help for a short online help'))
78
        optparser.error(_('incorrect number of arguments; use --help for a short help'))
10
79
        sys.exit(1)
79
        sys.exit(1)
11
80
80
12
81
    if not (opts.auth_file or opts.output or opts.stdout or opts.gdb):
81
    if not (opts.auth_file or opts.output or opts.stdout or opts.gdb):
14
82
        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'))
82
        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
83
        sys.exit(1)
83
        sys.exit(1)
16
84
84
17
85
    return (args[0], opts)
85
    return (args[0], opts)
18
86
86
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
39
    '''Change the master ID of a crash.'''
39
    '''Change the master ID of a crash.'''
24
40
40
25
41
    if len(args) != 2:
41
    if len(args) != 2:
27
42
        print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short online help)'
42
        print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short help)'
28
43
        sys.exit(1)
43
        sys.exit(1)
29
44
    (oldid, newid) = args
44
    (oldid, newid) = args
30
45
45
31
@@ -73,7 +73,7 @@
32
73
try:
73
try:
33
74
    command = globals()['command_' + args.pop(0)]
74
    command = globals()['command_' + args.pop(0)]
34
75
except KeyError:
75
except KeyError:
36
76
    print >> sys.stderr, 'unknown command (use --help for a short online help)'
76
    print >> sys.stderr, 'unknown command (use --help for a short help)'
37
77
    sys.exit(1)
77
    sys.exit(1)
38
78
command(crashdb, options, args)
78
command(crashdb, options, args)
39
79
79
40
80
80
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
84
84
46
85
.TP
85
.TP
47
86
.B \-h, \-\-help
86
.B \-h, \-\-help
49
87
Print a short online help that documents all options.
87
Print a short help that documents all options.
50
88
88
51
89
.TP
89
.TP
52
90
.B \-\-auth=\fIauthfile
90
.B \-\-auth=\fIauthfile
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Apport upstream developers		2009-09-14	Pending
Review via email: mp+11687@code.launchpad.net
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	75	(opts, args) = optparser.parse_args()	75	(opts, args) = optparser.parse_args()
6	76		76
7	77	if len(args) != 1:	77	if len(args) != 1:
9	78	optparser.error(_('incorrect number of arguments; use --help for a short online help'))	78	optparser.error(_('incorrect number of arguments; use --help for a short help'))
10	79	sys.exit(1)	79	sys.exit(1)
11	80		80
12	81	if not (opts.auth_file or opts.output or opts.stdout or opts.gdb):	81	if not (opts.auth_file or opts.output or opts.stdout or opts.gdb):
14	82	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'))	82	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	83	sys.exit(1)	83	sys.exit(1)
16	84		84
17	85	return (args[0], opts)	85	return (args[0], opts)
18	86		86
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	39	'''Change the master ID of a crash.'''	39	'''Change the master ID of a crash.'''
24	40		40
25	41	if len(args) != 2:	41	if len(args) != 2:
27	42	print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short online help)'	42	print >> sys.stderr, 'changeid needs exactly two arguments (use --help for a short help)'
28	43	sys.exit(1)	43	sys.exit(1)
29	44	(oldid, newid) = args	44	(oldid, newid) = args
30	45		45
31	@@ -73,7 +73,7 @@
32	73	try:	73	try:
33	74	command = globals()['command_' + args.pop(0)]	74	command = globals()['command_' + args.pop(0)]
34	75	except KeyError:	75	except KeyError:
36	76	print >> sys.stderr, 'unknown command (use --help for a short online help)'	76	print >> sys.stderr, 'unknown command (use --help for a short help)'
37	77	sys.exit(1)	77	sys.exit(1)
38	78	command(crashdb, options, args)	78	command(crashdb, options, args)
39	79		79
40	80		80
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	84		84
46	85	.TP	85	.TP
47	86	.B \-h, \-\-help	86	.B \-h, \-\-help
49	87	Print a short online help that documents all options.	87	Print a short help that documents all options.
50	88		88
51	89	.TP	89	.TP
52	90	.B \-\-auth=\fIauthfile	90	.B \-\-auth=\fIauthfile