Checkbox

Merge lp:~roadmr/checkbox/912946 into lp:checkbox

  1. 912946
  2. Merge into trunk
Proposed by Daniel Manrique
Status: Merged
Merged at revision: 1164
Proposed branch: lp:~roadmr/checkbox/912946
Merge into: lp:checkbox
Diff against target: 33 lines (+4/-2)
2 files modified
checkbox/lib/template_i18n.py (+2/-1)
debian/changelog (+2/-1)
To merge this branch: bzr merge lp:~roadmr/checkbox/912946
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+87826@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Daniel Manrique (roadmr) wrote :

Neglected to add a description :( Anyway, it's a very simple check to avoid bug 912946, where certain values of LANGUAGE (emptiness on one side of the colon) cause checkbox to barf and not read any jobs at all.

Revision history for this message
Marc Tardif (cr3) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox/lib/template_i18n.py'
2--- checkbox/lib/template_i18n.py 2010-02-16 21:09:28 +0000
3+++ checkbox/lib/template_i18n.py 2012-01-06 22:24:24 +0000
4@@ -77,7 +77,8 @@
5 languages = []
6 if environ.has_key("LANGUAGE") and environ["LANGUAGE"]:
7 for language in environ["LANGUAGE"].split(":"):
8- languages.extend(self._get_language_list(language))
9+ if language:
10+ languages.extend(self._get_language_list(language))
11
12 language = locale.setlocale(locale.LC_MESSAGES)
13 languages.extend(self._get_language_list(language))
14
15=== modified file 'debian/changelog'
16--- debian/changelog 2012-01-05 22:47:50 +0000
17+++ debian/changelog 2012-01-06 22:24:24 +0000
18@@ -31,6 +31,7 @@
19 (LP: #352986)
20 * Environment variables specified with environ: in a job description will be
21 passed to the backend for it to add to its environment. (LP: #897889)
22+ * Handle malformed LANGUAGE environment variable values (LP: #912946)
23
24 [Robert Roth]
25 * Fixed spelling mistakes in user_apps job file. (LP: #904209)
26@@ -39,7 +40,7 @@
27 * Added requires to suspend wireless jobs so they won't run if wireless isn't
28 present (LP: #907150)
29
30- -- Jeff Lane <jeff@ubuntu.com> Thu, 05 Jan 2012 11:18:39 -0500
31+ -- Daniel Manrique <daniel.manrique@canonical.com> Fri, 06 Jan 2012 17:14:39 -0500
32
33 checkbox (0.13) precise; urgency=low
34

Subscribers

People subscribed via source and target branches