]> Frank Brehm's Git Trees - pixelpark/python-packaging.git/commitdiff
Fixing gitlab/build-template-python.yaml
authorFrank Brehm <frank@brehm-online.com>
Thu, 29 Dec 2022 15:53:19 +0000 (16:53 +0100)
committerFrank Brehm <frank@brehm-online.com>
Thu, 29 Dec 2022 15:53:19 +0000 (16:53 +0100)
gitlab/build-template-python.yaml

index 3a1cfee919f0d85c0ff6f4beb1744db7ffeb10ab..458279c28e694de3eb484ec78714c57960c5669b 100644 (file)
@@ -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}"