diff --git a/overlay/usr/bin/gitlab-ci-aptly b/overlay/usr/bin/gitlab-ci-aptly
index b9c6a7e..4dc70e7 100755
--- a/overlay/usr/bin/gitlab-ci-aptly
+++ b/overlay/usr/bin/gitlab-ci-aptly
@@ -34,7 +34,7 @@ $aptly publish repo --skip-signing --distribution autobuilt --architectures all,
rm -rf public
cp -a ~/.aptly/public public
- # ease debugging since directory indices are disabled
+# ease debugging since directory indices are disabled
cd public
printf "apt source for %s" $CI_PROJECT_PATH > index.html
date >> index.html
diff --git a/overlay/usr/bin/gitlab-ci-git-buildpackage b/overlay/usr/bin/gitlab-ci-git-buildpackage
index c09eef6..d9e00ba 100755
--- a/overlay/usr/bin/gitlab-ci-git-buildpackage
+++ b/overlay/usr/bin/gitlab-ci-git-buildpackage
@@ -28,29 +28,29 @@ dpkg-checkbuilddeps
debversion=$(dpkg-parsechangelog -S Version)
buildpackage_options=
if [[ $debversion = *-* ]]; then
- echo "ensure pristine-tar branch exists and is current"
- git clean -fdx
- git reset --hard
- git fetch --all
- if git checkout -B pristine-tar origin/pristine-tar; then
- tar_version=`dpkg -s tar | grep '^Version:'`
- if [[ $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
+ echo "ensure pristine-tar branch exists and is current"
+ git clean -fdx
+ git reset --hard
+ git fetch --all
+ if git checkout -B pristine-tar origin/pristine-tar; then
+ tar_version=`dpkg -s tar | grep '^Version:'`
+ if [[ $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
+ fi
+ buildpackage_options=--git-pristine-tar
+ else
+ echo "no pristine-tar branch, trying uscan";
+ apt_get_auto_install gnupg2 libwww-perl;
+ uscan --verbose --download-current-version --force-download --rename;
fi
- buildpackage_options=--git-pristine-tar
- else
- 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"
+ echo "building native package version $debversion"
fi
echo "make $CI_COMMIT_REF_NAME branch current for gbp"
git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"