fix for evansde77#174

cloudant · Aug 31, 2017 · 46ff3cc · 46ff3cc
1 parent ac63a56
commit 46ff3cc
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/cirrus/plugins/builders/conda_env.py b/src/cirrus/plugins/builders/conda_env.py
@@ -29,10 +29,9 @@ def create(self, **kwargs):
         conda = kwargs.get('conda', self.conda_bin)
         upgrade = kwargs.get('upgrade', False)
         nosetupdevelop = kwargs.get('nosetupdevelop', False)
-        environment = kwargs.get(
-            'environment',
-            self.build_config.get('conda-environment', None)
-        )
+        environment = kwargs.get('environment', None)
+        if environment is None:
+            environment = self.build_config.get('conda-environment', None)
         if environment is None:
             msg = "No conda environment yaml specified in cirrus.conf [build] section or via --environment option"
             LOGGER.error(msg)