Ubuntu
apport package

Merge lp:~smoser/ubuntu/quantal/apport/lp1018552 into lp:ubuntu/quantal/apport

  1. Quantal (12.10)
  2. lp1018552
  3. Merge into quantal
Proposed by Scott Moser
Status: Merged
Merge reported by: Scott Moser
Merged at revision: not available
Proposed branch: lp:~smoser/ubuntu/quantal/apport/lp1018552
Merge into: lp:ubuntu/quantal/apport
Diff against target: 26 lines (+7/-1)
2 files modified
data/general-hooks/ubuntu.py (+1/-1)
debian/changelog (+6/-0)
To merge this branch: bzr merge lp:~smoser/ubuntu/quantal/apport/lp1018552
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+122147@code.launchpad.net
To post a comment you must log in.
lp:~smoser/ubuntu/quantal/apport/lp1018552 updated
341. By Scott Moser

urlopen.read() returns bytes, use bytes to compare

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/general-hooks/ubuntu.py'
2--- data/general-hooks/ubuntu.py 2012-08-28 09:11:22 +0000
3+++ data/general-hooks/ubuntu.py 2012-08-30 21:10:24 +0000
4@@ -337,7 +337,7 @@
5 except:
6 ami = None
7
8- if ami and ami.startswith('ami'):
9+ if ami and ami.startswith(b'ami'):
10 add_tag(report, 'ec2-images')
11 fields = {'Ec2AMIManifest': 'ami-manifest-path',
12 'Ec2Kernel': 'kernel-id',
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2012-08-28 09:11:22 +0000
16+++ debian/changelog 2012-08-30 21:10:24 +0000
17@@ -1,3 +1,9 @@
18+apport (2.5.1-0ubuntu4) UNRELEASED; urgency=low
19+
20+ * do not stack trace when ec2 metadata is available (LP: #1018552)
21+
22+ -- Scott Moser <smoser@ubuntu.com> Thu, 30 Aug 2012 16:36:53 -0400
23+
24 apport (2.5.1-0ubuntu3) quantal; urgency=low
25
26 * data/general/ubuntu.py: when creating a duplicate signature search the

Subscribers

People subscribed via source and target branches

to all changes: