Merge pull request #6 from guewen/fix-noop

Fix noop operations not considered as such
camptocamp · Jul 26, 2016 · 1c7ad72 · 1c7ad72
2 parents 2159f12 + 2caac33
commit 1c7ad72
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -12,6 +12,10 @@ Unreleased
   operations.  It enables line buffering and interactivity for pdb in the
   children processes.
 
+**Fixes**
+
+- Noop operations are really considered as such
+
 
 0.3.3 (2016-07-12)
 ++++++++++++++++++

diff --git a/marabunta/model.py b/marabunta/model.py
@@ -49,10 +49,10 @@ def is_processed(self, db_versions):
         return self.number in (v.number for v in db_versions if v.date_done)
 
     def is_noop(self):
-        has_operations = (mode.pre_operations or mode.post_operations
-                          for mode in self._version_modes.values())
-        has_upgrade_addons = (mode.upgrade_addons or mode.remove_addons
-                              for mode in self._version_modes.values())
+        has_operations = [mode.pre_operations or mode.post_operations
+                          for mode in self._version_modes.values()]
+        has_upgrade_addons = [mode.upgrade_addons or mode.remove_addons
+                              for mode in self._version_modes.values()]
         noop = (not has_operations and not has_upgrade_addons)
         return noop