From 9c3eb3e4c28bdbcb6a995ac07003500430093850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Fri, 19 Jul 2019 13:52:43 -0400 Subject: [PATCH 1/2] don't mix tabs and spaces --- overlay/usr/bin/gitlab-ci-git-buildpackage | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/overlay/usr/bin/gitlab-ci-git-buildpackage b/overlay/usr/bin/gitlab-ci-git-buildpackage index 6e2927e..4a1d029 100755 --- a/overlay/usr/bin/gitlab-ci-git-buildpackage +++ b/overlay/usr/bin/gitlab-ci-git-buildpackage @@ -34,29 +34,29 @@ if [[ $debversion = *-* ]]; then git fetch --all uscan_download="false" if git checkout -B pristine-tar origin/pristine-tar; then - orig=$(pristine-tar list| head -1) - tar_version=`dpkg -s tar | grep '^Version:'` - if pristine-tar checkout $orig; then - echo "pristine-tar works" - elif [[ $tar_version == "Version: 1.30"* ]]; then - echo "WARNING: tar v1.30 breaks pristine-tar when working with commits created by older versions of tar https://bugs.debian.org/901952, downgrading to tar 1.29b-1.1" - printf 'Package: tar\nPin: version 1.30+dfsg-2\nPin-Priority: -1\n' \ - > /etc/apt/preferences.d/ban-broken-tar.pref - $apt_get install --no-install-recommends wget - wget -q http://deb.debian.org/debian/pool/main/t/tar/tar_1.29b-1.1_amd64.deb - dpkg -i tar_1.29b-1.1_amd64.deb - rm -f tar_1.29b-1.1_amd64.deb - else - uscan_download="true" - fi - rm -f $orig - buildpackage_options=--git-pristine-tar + orig=$(pristine-tar list| head -1) + tar_version=`dpkg -s tar | grep '^Version:'` + if pristine-tar checkout $orig; then + echo "pristine-tar works" + elif [[ $tar_version == "Version: 1.30"* ]]; then + echo "WARNING: tar v1.30 breaks pristine-tar when working with commits created by older versions of tar https://bugs.debian.org/901952, downgrading to tar 1.29b-1.1" + printf 'Package: tar\nPin: version 1.30+dfsg-2\nPin-Priority: -1\n' \ + > /etc/apt/preferences.d/ban-broken-tar.pref + $apt_get install --no-install-recommends wget + wget -q http://deb.debian.org/debian/pool/main/t/tar/tar_1.29b-1.1_amd64.deb + dpkg -i tar_1.29b-1.1_amd64.deb + rm -f tar_1.29b-1.1_amd64.deb + else + uscan_download="true" + fi + rm -f $orig + buildpackage_options=--git-pristine-tar fi if [ $uscan_download = "true" ]; then - echo "no pristine-tar branch, trying uscan"; - apt_get_auto_install gnupg2 libwww-perl; - uscan --verbose --download-current-version --force-download --rename; + echo "no pristine-tar branch, trying uscan"; + apt_get_auto_install gnupg2 libwww-perl; + uscan --verbose --download-current-version --force-download --rename; fi else echo "building native package version $debversion" From 2dd560d329ef0df3c9aebf278e70f521ce404279 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Louis-Philippe=20V=C3=A9ronneau?= Date: Fri, 19 Jul 2019 13:54:06 -0400 Subject: [PATCH 2/2] make uscan_download true by default and inverse the logic --- overlay/usr/bin/gitlab-ci-git-buildpackage | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/overlay/usr/bin/gitlab-ci-git-buildpackage b/overlay/usr/bin/gitlab-ci-git-buildpackage index 4a1d029..f56dd8a 100755 --- a/overlay/usr/bin/gitlab-ci-git-buildpackage +++ b/overlay/usr/bin/gitlab-ci-git-buildpackage @@ -32,11 +32,12 @@ if [[ $debversion = *-* ]]; then git clean -fdx git reset --hard git fetch --all - uscan_download="false" + uscan_download="true" if git checkout -B pristine-tar origin/pristine-tar; then orig=$(pristine-tar list| head -1) tar_version=`dpkg -s tar | grep '^Version:'` if pristine-tar checkout $orig; then + uscan_download="false" echo "pristine-tar works" elif [[ $tar_version == "Version: 1.30"* ]]; then echo "WARNING: tar v1.30 breaks pristine-tar when working with commits created by older versions of tar https://bugs.debian.org/901952, downgrading to tar 1.29b-1.1" @@ -46,8 +47,6 @@ if [[ $debversion = *-* ]]; then wget -q http://deb.debian.org/debian/pool/main/t/tar/tar_1.29b-1.1_amd64.deb dpkg -i tar_1.29b-1.1_amd64.deb rm -f tar_1.29b-1.1_amd64.deb - else - uscan_download="true" fi rm -f $orig buildpackage_options=--git-pristine-tar