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

Proposed by Marc Tardif on 2010-04-17
Status: Merged
Merged at revision: not available
Proposed branch: lp:~cr3/checkbox/349768
Merge into: lp:checkbox
Diff against target: 29 lines (+3/-3)
2 files modified
debian/changelog (+1/-0)
scripts/suspend_test (+2/-3)
To merge this branch: bzr merge lp:~cr3/checkbox/349768
Reviewer Review Type Date Requested Status
Andy Whitcroft 2010-04-17 Pending
Review via email: mp+23610@code.launchpad.net
To post a comment you must log in.
petski (petski) wrote :

You're welcome...

Marc Tardif (cr3) wrote :

Hi petski, my apologies for not giving you due credit, I just made your patch available in a branch to benefit from the convenient review process in Launchpad. My intention was not to get credit for your work but rather make it available more conveniently :)

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 2010-04-17 16:14:22 +0000
3+++ debian/changelog 2010-04-19 15:18:23 +0000
4@@ -9,6 +9,7 @@
5 * Fixed starting the appropriate default browser on UNR (LP: #563050)
6 * Fixed ansi_parser script when outputting to stdout (LP: #560952)
7 * Fixed opening the report with the gconf preferred browser (LP: #562580)
8+ * Fixed suspend_test to use relative time for wakealarm (LP: #349768)
9
10 -- Marc Tardif <marc@ubuntu.com> Tue, 06 Apr 2010 14:17:46 -0400
11
12
13=== modified file 'scripts/suspend_test'
14--- scripts/suspend_test 2009-03-10 17:06:06 +0000
15+++ scripts/suspend_test 2010-04-19 15:18:23 +0000
16@@ -109,11 +109,10 @@
17 #
18 ctl='/sys/class/rtc/rtc0/wakealarm'
19 if [ -f "$ctl" ]; then
20- time=`date '+%s' -d "+ $timeout seconds"`
21 # Cancel any outstanding timers.
22 echo "0" >"$ctl"
23- # rtcN/wakealarm uses absolute time in seconds
24- echo "$time" >"$ctl"
25+ # rtcN/wakealarm can use relative time in seconds
26+ echo "+$timeout" >"$ctl"
27 return 0
28 fi
29 ctl='/proc/acpi/alarm'

Subscribers

People subscribed via source and target branches