Merge branch 'dev'

fauust · Jan 28, 2024 · 2b0575e · 2b0575e
2 parents 6807304 + dd76f4f
commit 2b0575e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/utils.py b/utils.py
@@ -217,7 +217,9 @@ def createDebRepo():
     mkdir ../debs
     find .. -maxdepth 1 -type f | xargs cp -t ../debs
     cat ../conf/distributions
+    set +e
     reprepro -b .. --ignore=wrongsourceversion include $VERSION_CODENAME ../*.changes
+    set -e
 """
             ),
         ],
@@ -245,7 +247,10 @@ def uploadDebArtifacts():
       COMPONENTS="main main/debug"
     fi
     mkdir -p /packages/%(prop:tarbuildnum)s/%(prop:buildername)s
-    cd .. && cp -r debs conf db dists pool /packages/%(prop:tarbuildnum)s/%(prop:buildername)s/
+    cd ..
+    for dir in debs conf db dists pool; do
+      [[ -d $dir ]] && cp -r $dir /packages/%(prop:tarbuildnum)s/%(prop:buildername)s/
+    done
     cat << EOF > /packages/%(prop:tarbuildnum)s/%(prop:buildername)s/mariadb.sources
 X-Repolib-Name: MariaDB
 Types: deb