Merge pull request timvideos#177 from mithro/conda-pin

scripts: Always update conda to pinned version.
mithro · Jul 25, 2019 · db09ad6 · db09ad6
2 parents a5e872a + 7cbe196
commit db09ad6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/scripts/download-env.sh b/scripts/download-env.sh
@@ -219,13 +219,13 @@ export PATH=$CONDA_DIR/bin:$PATH:/sbin
 			./Miniconda3-latest-Linux-x86_64.sh -p $CONDA_DIR -b -f || exit 1
 		)
 		fix_conda
-		conda config --system --set always_yes yes
-		conda config --system --set changeps1 no
 		conda config --system --add envs_dirs $CONDA_DIR/envs
 		conda config --system --add pkgs_dirs $CONDA_DIR/pkgs
-		pin_conda_package conda ${CONDA_VERSION}
-		conda update -q conda
 	fi
+	conda config --system --set always_yes yes
+	conda config --system --set changeps1 no
+	pin_conda_package conda ${CONDA_VERSION}
+	conda update -q conda
 	fix_conda
 	conda config --system --add channels timvideos
 	conda info