From eaebd8a4025122277b946183fbb8c4409a0b77f2 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Tue, 26 Sep 2017 21:23:51 +0200
Subject: [PATCH] Don't do fancy moves
---
gitlab/build.sh | 4 ++++
gitlab/functions.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/gitlab/build.sh b/gitlab/build.sh
index 8ae5502..599829d 100755
--- a/gitlab/build.sh
+++ b/gitlab/build.sh
@@ -30,3 +30,7 @@ fi
# Copy the .tar.bz2 and urls.txt
merge_conda_cache ${CONDA_ENVS_PATH}/.pkgs ${CONDA_FOLDER}/pkgs
+log_info ls ${CONDA_FOLDER}/pkgs
+ls ${CONDA_FOLDER}/pkgs
+log_info ls ${CONDA_ENVS_PATH}/.pkgs
+ls ${CONDA_ENVS_PATH}/.pkgs
diff --git a/gitlab/functions.sh b/gitlab/functions.sh
index 90c1623..1cdd2a2 100644
--- a/gitlab/functions.sh
+++ b/gitlab/functions.sh
@@ -273,7 +273,7 @@ merge_conda_cache() {
_urls="${1}/urls.txt"
if [ -e ${2} ]; then
log_info "Merging urls.txt and packages with cached files..."
- mv -n ${2}/*.tar.bz2 ${1}/
+ mv ${2}/*.tar.bz2 ${1}/
cat ${_urls} ${_cached_urls} | sort | uniq > ${_urls}
fi
fi
--
GitLab