Merge branch 'release/0.19.6'

conan-io · Oct 15, 2018 · 951236a · 951236a
2 parents ccb2b0c + 5252f41
commit 951236a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/cpt/__init__.py b/cpt/__init__.py
@@ -1,2 +1,2 @@
 
-__version__ = '0.19.5'
+__version__ = '0.19.6'
diff --git a/cpt/test/unit/packager_test.py b/cpt/test/unit/packager_test.py
@@ -492,14 +492,17 @@ def select_defaults_test(self):
 
         self.assertEquals(builder.build_generator._gcc_versions, [])
 
-        with tools.environment_append({"CONAN_CLANG_VERSIONS": "4.8, 5"}):
+        with tools.environment_append({"CONAN_CLANG_VERSIONS": "4.8, 5",
+                                       "CONAN_APPLE_CLANG_VERSIONS": " "}):
             builder = ConanMultiPackager(platform_info=platform_mock_for("Linux"),
                                          username="foo",
                                          reference="lib/1.0",
                                          ci_manager=self.ci_manager)
 
             self.assertEquals(builder.build_generator._gcc_versions, [])
             self.assertEquals(builder.build_generator._clang_versions, ["4.8", "5"])
+            self.assertEquals(builder.build_generator._clang_versions, ["4.8", "5"])
+            self.assertEquals(builder.build_generator._apple_clang_versions, [])
 
     def test_upload(self):
         runner = MockRunner()

diff --git a/cpt/tools.py b/cpt/tools.py
@@ -10,4 +10,6 @@ def get_bool_from_env(var_name):
 def split_colon_env(varname):
     if os.getenv(varname) is None:
         return None
+    if os.getenv(varname).strip() == "":
+        return []
     return [a.strip() for a in list(filter(None, os.getenv(varname, "").split(",")))]