Checkbox

Merge lp:~roadmr/checkbox/chromium-submission into lp:checkbox

  1. chromium-submission
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Merged at revision: 1531
Proposed branch: lp:~roadmr/checkbox/chromium-submission
Merge into: lp:checkbox
Diff against target: 53 lines (+12/-2)
2 files modified
checkbox/user_interface.py (+7/-1)
debian/changelog (+5/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/chromium-submission
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+116368@code.launchpad.net

Description of the change

If the user's preferred browser is chromium-browser, use the command line parameter that allows opening file:// URLs, otherwise this browser is unable to open the checkbox report.

To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Thanks for adding support for chromium-browser!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox/user_interface.py'
2--- checkbox/user_interface.py 2012-06-12 15:03:42 +0000
3+++ checkbox/user_interface.py 2012-07-23 20:53:22 +0000
4@@ -163,7 +163,8 @@
5
6 # if gnome-session is running, try gnome-open; special-case firefox
7 # (and more generally, mozilla browsers) and epiphany to open a new window
8- # with respectively -new-window and --new-window
9+ # with respectively -new-window and --new-window; special-case chromium-browser
10+ # to allow file:// URLs as needed by the checkbox report.
11 try:
12 if os.getenv("DISPLAY") and \
13 subprocess.call(["pgrep", "-x", "-u", str(uid), "gnome-panel|gconfd-2"],
14@@ -182,6 +183,11 @@
15 if browser:
16 subprocess.Popen(sudo_prefix + [browser.group(0), "--new-window", url])
17 return
18+
19+ browser = re.match("(chromium-browser[^\s]*)", preferred_browser)
20+ if browser:
21+ subprocess.Popen(sudo_prefix + [browser.group(0), "--allow-file-access-from-files", url])
22+ return
23
24 subprocess.Popen(sudo_prefix + [preferred_browser % url], shell=True)
25 return
26
27=== modified file 'debian/changelog'
28--- debian/changelog 2012-07-20 19:50:33 +0000
29+++ debian/changelog 2012-07-23 20:53:22 +0000
30@@ -1,11 +1,14 @@
31 checkbox (0.14.3) precise; urgency=low
32
33+ [ Marc Tardif ]
34 [Brendan Donegan]
35 * Removed call to unlink temporary file in Html5Thread part of gpu_test.
36 Also addressed a few pyflakes complaints and removed a stray print.
37
38 [Daniel Manrique]
39 * New version 0.14.3 for Quantal Quetzal development.
40+ * Instruct Chromium browser to accept file:// URLs so it can correctly
41+ open the checkbox submission.xml report (LP: #1026614)
42
43 [Jeff Marcom]
44 * Added timeout to job call for disk smart test.
45@@ -13,7 +16,8 @@
46 [Marc Tardif]
47 * Escaping encoded strings in udevadm output (LP: #1025381)
48
49- -- Marc Tardif <marc@ubuntu.com> Fri, 20 Jul 2012 15:49:36 -0400
50+
51+ -- Daniel Manrique <roadmr@ubuntu.com> Mon, 23 Jul 2012 16:49:31 -0400
52
53 checkbox (0.14.2) quantal; urgency=low
54

Subscribers

People subscribed via source and target branches