Merge lp:~cr3/checkbox/597305 into lp:checkbox

Proposed by Marc Tardif on 2011-08-03
Status: Merged
Merged at revision: 980
Proposed branch: lp:~cr3/checkbox/597305
Merge into: lp:checkbox
Diff against target: 49 lines (+10/-5)
2 files modified
debian/changelog (+7/-4)
plugins/scripts_info.py (+3/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/597305
Reviewer Review Type Date Requested Status
Jeff Lane 2011-08-03 Approve on 2011-08-04
Review via email: mp+70349@code.launchpad.net
To post a comment you must log in.
Jeff Lane (bladernr) wrote :

Approve. Nice and simple... I like that :)

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 2011-07-22 20:29:02 +0000
3+++ debian/changelog 2011-08-03 19:16:33 +0000
4@@ -1,5 +1,10 @@
5 checkbox (0.12.4) oneiric; urgency=low
6
7+ [Brendan Donegan]
8+ * Refactored job definition files.
9+ * Fixed dependencies and test naming.
10+ * Added Online CPU before/after suspend test.
11+
12 [Daniel Manrique]
13 * Further improvements to make frontend/backend communication more reliable.
14 Prevents stuck backends, failure to close the GUI due to lack of reply
15@@ -19,10 +24,8 @@
16 * Make the "Next" button the default action when Enter is pressed, to
17 streamline testing with the GTK interface.
18
19- [Brendan Donegan]
20- * Refactored job definition files.
21- * Fixed dependencies and test naming.
22- * Added Online CPU before/after suspend test.
23+ [Marc Tardif]
24+ * Fixed udevam not being found because /sbin not in PATH (LP: #597305)
25
26 [Sylvain Pineau]
27 * Expose the message store to other plugins, via firing an expose-msgstore
28
29=== modified file 'plugins/scripts_info.py'
30--- plugins/scripts_info.py 2010-02-16 15:18:39 +0000
31+++ plugins/scripts_info.py 2011-08-03 19:16:33 +0000
32@@ -16,7 +16,7 @@
33 # You should have received a copy of the GNU General Public License
34 # along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
35 #
36-from checkbox.lib.environ import prepend_path
37+from checkbox.lib.environ import append_path, prepend_path
38
39 from checkbox.plugin import Plugin
40 from checkbox.properties import Path
41@@ -34,6 +34,8 @@
42
43 def gather(self):
44 prepend_path(self.scripts_path)
45+ append_path("/sbin")
46+ append_path("/usr/sbin")
47
48
49 factory = ScriptsInfo

Subscribers

People subscribed via source and target branches