Merge pull request #16 from ika-rwth-aachen/fix/no-repos

Fix non-recursive vcs import if no .repos is present
ika-rwth-aachen · Oct 20, 2023 · 85423ac · 85423ac
2 parents 900fbeb + 66a493c
commit 85423ac
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -65,8 +65,8 @@ ARG VCS_IMPORT_FILE=".repos"
 ARG ENABLE_RECURSIVE_VCS_IMPORT="true"
 RUN if [[ $ENABLE_RECURSIVE_VCS_IMPORT == 'true' ]]; then \
         /usr/local/bin/recursive_vcs_import.py src src/upstream ; \
-    else \
-        [[ -f src/target/${VCS_IMPORT_FILE} ]] && vcs import --recursive src/upstream < src/target/${VCS_IMPORT_FILE} ; \
+    elif [[ -f src/target/${VCS_IMPORT_FILE} ]]; then \
+        vcs import --recursive src/upstream < src/target/${VCS_IMPORT_FILE} ; \
     fi
 
 # remove blacklisted packages from workspace