Ubuntu
apport package

Merge lp:~seb128/ubuntu/wily/apport/str_no_decoding into lp:~ubuntu-core-dev/ubuntu/wily/apport/ubuntu

  1. Wily (15.10)
  2. str_no_decoding
  3. Merge into ubuntu
Proposed by Sebastien Bacher on 2015-10-01
Status: Merged
Merged at revision: 2459
Proposed branch: lp:~seb128/ubuntu/wily/apport/str_no_decoding
Merge into: lp:~ubuntu-core-dev/ubuntu/wily/apport/ubuntu
Diff against target: 31 lines (+8/-2)
2 files modified
data/package-hooks/source_ubiquity.py (+1/-1)
debian/changelog (+7/-1)
To merge this branch: bzr merge lp:~seb128/ubuntu/wily/apport/str_no_decoding
Reviewer Review Type Date Requested Status
Martin Pitt 2015-10-01 Approve on 2015-10-07
Review via email: mp+273076@code.launchpad.net

Commit Message

* data/package-hooks/sources_ubiquity.py:
  - don't try to use decode on a str object, that's not required/working
    with python3 (lp: #1501773)

Description of the Change

* data/package-hooks/sources_ubiquity.py:
  - don't try to use decode on a str object, that's not required/working
    with python3 (lp: #1501773)

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/package-hooks/source_ubiquity.py'
2--- data/package-hooks/source_ubiquity.py 2015-08-28 17:03:57 +0000
3+++ data/package-hooks/source_ubiquity.py 2015-10-01 14:22:45 +0000
4@@ -57,7 +57,7 @@
5
6 def add_info(report, ui):
7 add_installation_log(report, 'UbiquitySyslog', 'syslog')
8- syslog = report['UbiquitySyslog'].decode('UTF-8')
9+ syslog = report['UbiquitySyslog']
10 if 'Buffer I/O error on device' in syslog:
11 if re.search('Attached .* CD-ROM (\w+)', syslog):
12 cd_drive = re.search('Attached .* CD-ROM (\w+)', syslog).group(1)
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2015-09-28 21:24:49 +0000
16+++ debian/changelog 2015-10-01 14:22:45 +0000
17@@ -1,8 +1,14 @@
18 apport (2.19-0ubuntu2) UNRELEASED; urgency=medium
19
20+ [ Brian Murray ]
21 * data/iwlwifi_error_dump: fix add_package call. (LP: #1496268)
22
23- -- Brian Murray <brian@ubuntu.com> Mon, 28 Sep 2015 14:24:22 -0700
24+ [ Sebastien Bacher ]
25+ * data/package-hooks/sources_ubiquity.py:
26+ - don't try to use decode on a str object, that's not required/working
27+ with python3 (lp: #1501773)
28+
29+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 01 Oct 2015 15:49:57 +0200
30
31 apport (2.19-0ubuntu1) wily; urgency=medium
32

Subscribers

People subscribed via source and target branches