From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 29 Dec 2022 15:53:19 +0000 (+0100)
Subject: Fixing gitlab/build-template-python.yaml
X-Git-Tag: v1.0~8
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=79d0bd57ba3d36b2939f1361bdb746b5b71124b6;p=pixelpark%2Fpython-packaging.git

Fixing gitlab/build-template-python.yaml
---

diff --git a/gitlab/build-template-python.yaml b/gitlab/build-template-python.yaml
index 3a1cfee..458279c 100644
--- a/gitlab/build-template-python.yaml
+++ b/gitlab/build-template-python.yaml
@@ -149,13 +149,13 @@ variables:
     - |
       echo -e "\e[0Ksection_start:$( date +%s ):update_tzdata[collapsed=true]\r\e[0KExecuting: Installing or upgrading TZdata ..."
       if rpm -qa | grep '^tzdata-' >/dev/null ; then
-        echo "Reinstalling tzdata ..."
-        echo "Executing: ${YUM} --assumeyes reinstall tzdata || true"
-        ${YUM} --assumeyes reinstall tzdata || true
+          echo "Reinstalling tzdata ..."
+          echo "Executing: ${YUM} --assumeyes reinstall tzdata || true"
+          ${YUM} --assumeyes reinstall tzdata || true
       else
-        echo "Installing tzdata ..."
-        echo "Executing: ${YUM} --assumeyes install tzdata || true"
-        ${YUM} --assumeyes install tzdata || true
+          echo "Installing tzdata ..."
+          echo "Executing: ${YUM} --assumeyes install tzdata || true"
+          ${YUM} --assumeyes install tzdata || true
       fi
       echo
       echo "Timezone database:"
@@ -255,7 +255,11 @@ variables:
       fi
       echo
       echo "Adding Changelog to '${TGT_SPEC_FILE}' ..."
-      dch2speclog debian/changelog >>"${TGT_SPEC_FILE}"
+      if [[ -f bin/dch2speclog ]] ; then
+          python${PYTHON_VERSION_DOT} bin/dch2speclog debian/changelog >>"${TGT_SPEC_FILE}"
+      else
+          dch2speclog debian/changelog >>"${TGT_SPEC_FILE}"
+      fi
       echo
       echo "Generated spec-file:"
       cat "${TGT_SPEC_FILE}"