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

Subscribers

People subscribed via source and target branches