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

[Marc Tardif]

First, ran ./bin/checkbox-gtk with one test resulting in 140 files under the store/ directory and no errors in checkbox.log. Second, re-ran ./bin/checkbox-gtk, answered rerun, resulting in 140 files and still no errors.

[Daniel Manrique (roadmr)]

The code looks good, and since it seems to have been thoroughly tested, merging. Thanks!a

review: Approve

=== modified file 'checkbox/job.py'
--- checkbox/job.py	2012-06-20 20:33:09 +0000
+++ checkbox/job.py	2012-06-27 21:39:20 +0000
@@ -104,4 +104,18 @@
 class JobStore(MessageStore):
     """A job store which stores its jobs in a file system hierarchy."""
 
-    pass
+    def add(self, job):
+        # Return if the same job is already in the store
+        if list(self._find_matching_messages(name=job["name"])):
+            return
+
+        return super(JobStore, self).add(job)
+
+    def _find_matching_messages(self, **kwargs):
+        for filename in self._walk_messages():
+            message = self._read_message(filename,cache=True)
+            for key, value in kwargs.items():
+                if message.get(key) != value:
+                    break
+            else:
+                yield filename

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-27 20:35:27 +0000
+++ debian/changelog	2012-06-27 21:39:20 +0000
@@ -3,6 +3,11 @@
   [Jeff Lane]
   * New version 0.14.2 for Quantal Quetzal development.
 
+  [Marc Tardif]
+  * Fixed duplicate jobs appearing in the store when rerunning jobs.
+  * jobs/suspend.txt.in: Removed redundant dependencies which confuses
+    the latest resolver algorithm.
+
  -- Jeff Lane <[e-mail]>  Wed, 27 Jun 2012 16:34:12 -0400
 
 checkbox (0.14.1) quantal; urgency=low

=== modified file 'jobs/suspend.txt.in'
--- jobs/suspend.txt.in	2012-06-27 17:04:01 +0000
+++ jobs/suspend.txt.in	2012-06-27 21:39:20 +0000
@@ -172,7 +172,7 @@
 
 plugin: shell
 name: suspend/wireless_after_suspend
-depends: suspend/suspend_advanced suspend/wireless_before_suspend
+depends: suspend/suspend_advanced
 requires: device.category == 'WIRELESS'
 command: connect_wireless && internet_test --interface=`nmcli dev list | grep -B 1 wireless | grep GENERAL.DEVICE | awk '{print $2}'` && for con in `cat $CHECKBOX_DATA/connections`; do nmcli con up uuid "$con"; done
 _description: