Ubuntu
mysql-5.5 package

Merge lp:~matttbe/ubuntu/quantal/mysql-5.5/lp1013171 into lp:ubuntu/quantal/mysql-5.5

  1. Quantal (12.10)
  2. lp1013171
  3. Merge into quantal
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 21
Proposed branch: lp:~matttbe/ubuntu/quantal/mysql-5.5/lp1013171
Merge into: lp:ubuntu/quantal/mysql-5.5
Diff against target: 50 lines (+9/-4)
2 files modified
debian/changelog (+5/-1)
debian/mysql-server-5.5.py (+4/-3)
To merge this branch: bzr merge lp:~matttbe/ubuntu/quantal/mysql-5.5/lp1013171
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Clint Byrum Pending
Review via email: mp+113043@code.launchpad.net

Description of the change

Hello Clint,

This is just a patch to update apport hook for python3.
I set you as reviewer because you're the latest commiter on the main branch and the version is still set as 'UNRELEASED' but I can add ubuntu-sponsors team if you want ;)

Have a nice day,

Matt

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks! Committed, but not uploaded yet just for this change.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-19 18:56:08 +0000
3+++ debian/changelog 2012-07-02 13:43:31 +0000
4@@ -1,5 +1,6 @@
5 mysql-5.5 (5.5.25-0ubuntu3) UNRELEASED; urgency=low
6
7+ [ Clint Byrum ]
8 * d/additions/my.cnf: Ensure mysql errors are written to log file.
9 (LP: #1014732)
10 * d/mysql-server-5.5.mysql-server.logrotate: Add
11@@ -8,7 +9,10 @@
12 * d/rules: use WITH_SSL=bundled to ensure that we do not accidentally
13 build against openssl.
14
15- -- Clint Byrum <clint@ubuntu.com> Tue, 19 Jun 2012 11:55:38 -0700
16+ [ Matthieu Baerts (matttbe) ]
17+ * Update apport hook for python3 ; patch by Edward Donovan (LP: #1013171)
18+
19+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Mon, 02 Jul 2012 15:21:41 +0200
20
21 mysql-5.5 (5.5.25-0ubuntu2) quantal; urgency=low
22
23
24=== modified file 'debian/mysql-server-5.5.py'
25--- debian/mysql-server-5.5.py 2011-11-21 22:52:53 +0000
26+++ debian/mysql-server-5.5.py 2012-07-02 13:43:31 +0000
27@@ -4,6 +4,7 @@
28 Author: Mathias Gug <mathias.gug@canonical.com>
29 '''
30
31+from __future__ import print_function, unicode_literals
32 import os, os.path
33
34 from apport.hookutils import *
35@@ -42,12 +43,12 @@
36 for f in os.listdir('/etc/mysql/conf.d'):
37 _add_my_conf_files(report, os.path.join('/etc/mysql/conf.d', f))
38 try:
39- report['MySQLVarLibDirListing'] = unicode(os.listdir('/var/lib/mysql'))
40+ report['MySQLVarLibDirListing'] = str(os.listdir('/var/lib/mysql'))
41 except OSError:
42- report['MySQLVarLibDirListing'] = unicode(False)
43+ report['MySQLVarLibDirListing'] = str(False)
44
45 if __name__ == '__main__':
46 report = {}
47 add_info(report)
48 for key in report:
49- print '%s: %s' % (key, report[key].split('\n', 1)[0])
50+ print('%s: %s' % (key, report[key].split('\n', 1)[0]))

Subscribers

People subscribed via source and target branches