Chromium Browser

Merge lp:~matttbe/chromium-browser/lp1013171 into lp:~chromium-team/chromium-browser/chromium-browser.quantal

  1. lp1013171
  2. Merge into chromium-browser.quantal
Proposed by Matthieu Baerts
Status: Merged
Merged at revision: 745
Proposed branch: lp:~matttbe/chromium-browser/lp1013171
Merge into: lp:~chromium-team/chromium-browser/chromium-browser.quantal
Diff against target: 82 lines (+17/-8)
2 files modified
debian/apport/chromium-browser.py (+9/-8)
debian/changelog (+8/-0)
To merge this branch: bzr merge lp:~matttbe/chromium-browser/lp1013171
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Chromium team Pending
Review via email: mp+113055@code.launchpad.net

Description of the change

Hello members of the Chromium team,

This is just a patch to update apport hook for python3.
I set you as reviewer because you're the owner of the main branch but I can add ubuntu-sponsors team and propose a debdiff if you want ;)

Have a nice day,

Matt

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

This was merged into my branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/apport/chromium-browser.py'
2--- debian/apport/chromium-browser.py 2011-05-09 17:41:33 +0000
3+++ debian/apport/chromium-browser.py 2012-07-02 14:36:23 +0000
4@@ -11,6 +11,7 @@
5 the full text of the license.
6 '''
7
8+from __future__ import print_function
9 import os, sys, getopt, codecs
10 import time
11 from stat import *
12@@ -57,7 +58,7 @@
13 report['RelatedPackagesPolicy'] = ''
14 for pkg in pkgs:
15 script = subprocess.Popen(['apt-cache', 'policy', pkg], stdout=subprocess.PIPE)
16- report['RelatedPackagesPolicy'] += script.communicate()[0] + "\n"
17+ report['RelatedPackagesPolicy'] += str(script.communicate()[0]) + "\n"
18
19 def gconf_values(report, keys):
20 report['gconf-keys'] = ''
21@@ -67,7 +68,7 @@
22 except OSError:
23 report['gconf-keys'] = "gconftool-2 not found"
24 return
25- out = script.communicate()[0]
26+ out = str(script.communicate()[0])
27 if out == "":
28 out = "**unset**\n"
29 report['gconf-keys'] += key + " = " + out
30@@ -105,7 +106,7 @@
31 # list entensions+versions
32 report['ChromiumPrefs'] += "extensions/settings =\n"
33 if 'settings' in entry['extensions']:
34- for ext in entry['extensions']['settings'].keys():
35+ for ext in list(entry['extensions']['settings'].keys()):
36 report['ChromiumPrefs'] += " - '" + ext + "'\n"
37 if 'manifest' in entry['extensions']['settings'][ext]:
38 for k in [ 'name', 'description', 'version', 'update_url' ]:
39@@ -243,17 +244,17 @@
40
41 # Disk usage
42 script = subprocess.Popen([ 'df', '-Th' ], stdout=subprocess.PIPE)
43- report['DiskUsage'] = script.communicate()[0] + "\n\nInodes:\n"
44+ report['DiskUsage'] = str(script.communicate()[0]) + "\n\nInodes:\n"
45 script = subprocess.Popen([ 'df', '-ih' ], stdout=subprocess.PIPE)
46- report['DiskUsage'] += script.communicate()[0]
47+ report['DiskUsage'] += str(script.communicate()[0])
48
49 ## DEBUGING ##
50 if __name__ == '__main__':
51 sys.stdout = codecs.getwriter('utf8')(sys.stdout)
52 try:
53 opts, args = getopt.getopt(sys.argv[1:], "-u:", [ 'user-dir=' ])
54- except getopt.GetoptError, err:
55- print str(err)
56+ except getopt.GetoptError as err:
57+ print(str(err))
58 sys.exit(2)
59
60 userdir = None
61@@ -266,4 +267,4 @@
62 report = {}
63 add_info(report, userdir = userdir)
64 for key in report:
65- print '[%s]\n%s\n' % (key, report[key])
66+ print('[%s]\n%s\n' % (key, report[key]))
67
68=== modified file 'debian/changelog'
69--- debian/changelog 2012-06-18 16:37:20 +0000
70+++ debian/changelog 2012-07-02 14:36:23 +0000
71@@ -1,3 +1,11 @@
72+chromium-browser (18.0.1025.168~r134367-0ubuntu2) UNRELEASED; urgency=low
73+
74+ * debian/apport:
75+ - Update apport hook for python3 (LP: #1013171)
76+ patch made with the help of Edward Donovan
77+
78+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Mon, 02 Jul 2012 16:21:57 +0200
79+
80 chromium-browser (18.0.1025.168~r134367-0ubuntu1) quantal; urgency=low
81
82 * debian/rules

Subscribers

People subscribed via source and target branches

to all changes: