Merge branch 'release/0.20.2'

conan-io · Nov 5, 2018 · 2117f5d · 2117f5d
2 parents c06445f + 4846df3
commit 2117f5d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,3 +1,3 @@
 
-__version__ = '0.20.0'
+__version__ = '0.20.2'
 NEWEST_CONAN_SUPPORTED = "1.9"
diff --git a/cpt/packager.py b/cpt/packager.py
@@ -391,7 +391,7 @@ def add(self, settings=None, options=None, env_vars=None, build_requires=None, r
     def remove_build_if(self, predicate):
         filtered_builds = []
         for build in self.items:
-            if predicate(build):
+            if not predicate(build):
                 filtered_builds.append(build)
 
         self._builds = filtered_builds

diff --git a/cpt/test/unit/packager_test.py b/cpt/test/unit/packager_test.py
@@ -45,8 +45,8 @@ def _add_build(self, number, compiler=None, version=None):
     def test_remove_build_if(self):
         self.packager.add({"arch": "x86", "build_type": "Release", "compiler": "gcc", "compiler.version": "6"})
         self.packager.add({"arch": "x86", "build_type": "Debug", "compiler": "gcc", "compiler.version": "6"})
-        self.packager.add({"arch": "x86_64", "build_type": "Release", "compiler": "gcc", "compiler.version": "7"})
-        self.packager.add({"arch": "x86_64", "build_type": "Debug", "compiler": "gcc", "compiler.version": "7"})
+        self.packager.add({"arch": "x86", "build_type": "Release", "compiler": "gcc", "compiler.version": "7"})
+        self.packager.add({"arch": "x86", "build_type": "Debug", "compiler": "gcc", "compiler.version": "7"})
 
         self.packager.remove_build_if(lambda build: build.settings["compiler.version"] == "6")
 
@@ -56,8 +56,8 @@ def test_remove_build_if(self):
                                                reference="lib/1.0",
                                                ci_manager=self.ci_manager)
 
-        packager_expected.add({"arch": "x86", "build_type": "Release", "compiler": "gcc", "compiler.version": "6"})
-        packager_expected.add({"arch": "x86", "build_type": "Debug", "compiler": "gcc", "compiler.version": "6"})
+        packager_expected.add({"arch": "x86", "build_type": "Release", "compiler": "gcc", "compiler.version": "7"})
+        packager_expected.add({"arch": "x86", "build_type": "Debug", "compiler": "gcc", "compiler.version": "7"})
 
         self.assertEqual([tuple(a) for a in self.packager.items], packager_expected.items)