Apport

Merge lp:~gothicx/apport/show_msg_deprecated_options into lp:~ubuntu-core-dev/ubuntu/karmic/apport/ubuntu

  1. show_msg_deprecated_options
  2. Merge into ubuntu
Proposed by Marco Rodrigues
Status: Merged
Merged at revision: not available
Proposed branch: lp:~gothicx/apport/show_msg_deprecated_options
Merge into: lp:~ubuntu-core-dev/ubuntu/karmic/apport/ubuntu
Diff against target: 33 lines
2 files modified
bin/apport-bug (+8/-1)
debian/changelog (+1/-1)
To merge this branch: bzr merge lp:~gothicx/apport/show_msg_deprecated_options
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+13337@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Looks okay now, but this should go into trunk, thus merging by hand.

review: Approve
Revision history for this message
Martin Pitt (pitti) wrote :

> Looks okay now, but this should go into trunk, thus merging by hand.

Sorry, no, that -p/-P handling is Ubuntu specific.

Revision history for this message
Martin Pitt (pitti) wrote :

Merged now with simplification. (r1561) Thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/apport-bug'
2--- bin/apport-bug 2009-10-08 07:32:50 +0000
3+++ bin/apport-bug 2009-10-14 11:15:19 +0000
4@@ -38,9 +38,16 @@
5 # main
6 #
7
8+# Show warning about deprecated options.
9+if [ "$1" = "-p" ] || [ "$1" = "--package" ]; then
10+ echo "Usage: $0 <package>\nThe option -p, --package <package> is deprecated, please do not use it."
11+elif [ "$1" = "-P" ] || [ "$1" = "--pid" ]; then
12+ echo "Usage: $0 <pid>\nThe option -P, --pid <pid> is deprecated, please do not use it."
13+fi
14+
15 # keep backwards compatibility with old documentation which says to use
16 # ubuntu-bug -p packagename
17-if [ $# = 2 ] && [ "$1" = '-p' ]; then
18+if [ $# = 2 ] && ( [ "$1" = '-p' ] || [ "$1" = '-P' ]; ) then
19 shift
20 fi
21
22
23=== modified file 'debian/changelog'
24--- debian/changelog 2009-10-13 23:46:20 +0000
25+++ debian/changelog 2009-10-14 11:15:19 +0000
26@@ -1,7 +1,7 @@
27 apport (1.9.2-0ubuntu3) UNRELEASED; urgency=low
28
29 [ Brian Murray ]
30- * apport/hookutils.py: include upstream commit 1624 for "comm" error codes.
31+ * apport/hookutils.py: include upstream commit 1624 for "comm" error codes. (LP: #414194)
32
33 -- Kees Cook <kees@ubuntu.com> Tue, 13 Oct 2009 16:41:59 -0700
34

Subscribers

People subscribed via source and target branches