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

[Daniel Manrique]

Welcome and test selection screens failed because of a missing _recover attribute that was removed in revision 1041. I basically just put them back with a (hopefully) sensible default value.

Even though I tested that things work fine with this change (i.e. if I select "No" to "Restore previous run?" then the store/0/ directory gets cleared out) I'd appreciate review on this, to ensure that this (trivial) change is sane.

[Marc Tardif (cr3)]

The change looks like it "recovers" the same behavior as before, looks good!

review: Approve

[Brendan Donegan (brendan-donegan)]

My testing shows it works well now. I've no objections to this merge request.

review: Approve

[Brendan Donegan (brendan-donegan)]

Heh, I missed cr3's approve there.

=== modified file 'debian/changelog'
--- debian/changelog	2011-09-15 14:35:13 +0000
+++ debian/changelog	2011-09-19 20:09:49 +0000
@@ -1,8 +1,11 @@
 checkbox (0.12.8) oneiric; urgency=low
 
-  * Incremented version 
+  [Daniel Manrique]
+  * Restored _recover attribute, re-enabling welcome and test selection
+    screens (LP: #852204)
+  * Remove memory/test from the Ubuntu Friendly whitelist (LP: #853799)
 
- -- Daniel Manrique <[e-mail]>  Thu, 15 Sep 2011 10:34:02 -0400
+ -- Daniel Manrique <[e-mail]>  Mon, 19 Sep 2011 15:31:24 -0400
 
 checkbox (0.12.7) oneiric; urgency=low
 

=== modified file 'plugins/intro_prompt.py'
--- plugins/intro_prompt.py	2011-09-12 13:52:18 +0000
+++ plugins/intro_prompt.py	2011-09-19 20:09:49 +0000
@@ -27,6 +27,8 @@
     def register(self, manager):
         super(IntroPrompt, self).register(manager)
 
+        self._recover = False
+
         self._manager.reactor.call_on("begin-recover", self.begin_recover)
 
         # Introduction should be prompted last

=== modified file 'plugins/suites_prompt.py'
--- plugins/suites_prompt.py	2011-09-12 13:52:18 +0000
+++ plugins/suites_prompt.py	2011-09-19 20:09:49 +0000
@@ -43,6 +43,7 @@
         self._depends = {}
         self._jobs = {}
         self._persist = None
+        self._recover = False 
 
         for (rt, rh) in [
              ("begin-persist", self.begin_persist),