docker
/
ci-image-git-buildpackage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't mix tabs and spaces

This commit is contained in:
Louis-Philippe Véronneau 2019-07-19 13:52:43 -04:00
parent 9387318146
commit 9c3eb3e4c2
No known key found for this signature in database
GPG Key ID: 7AEAC4EC6AAA0A97
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
overlay/usr/bin/gitlab-ci-git-buildpackage
View File

@ -34,29 +34,29 @@ if [[ $debversion = *-* ]]; then
git fetch --all git fetch --all
uscan_download="false" uscan_download="false"
if git checkout -B pristine-tar origin/pristine-tar; then if git checkout -B pristine-tar origin/pristine-tar; then
orig=$(pristine-tar list| head -1) orig=$(pristine-tar list| head -1)
tar_version=`dpkg -s tar | grep '^Version:'` tar_version=`dpkg -s tar | grep '^Version:'`
if pristine-tar checkout $orig; then if pristine-tar checkout $orig; then
echo "pristine-tar works" echo "pristine-tar works"
elif [[ $tar_version == "Version: 1.30"* ]]; then 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" 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' \ printf 'Package: tar\nPin: version 1.30+dfsg-2\nPin-Priority: -1\n' \
> /etc/apt/preferences.d/ban-broken-tar.pref > /etc/apt/preferences.d/ban-broken-tar.pref
$apt_get install --no-install-recommends wget $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 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 dpkg -i tar_1.29b-1.1_amd64.deb
rm -f tar_1.29b-1.1_amd64.deb rm -f tar_1.29b-1.1_amd64.deb
else else
uscan_download="true" uscan_download="true"
fi fi
rm -f $orig rm -f $orig
buildpackage_options=--git-pristine-tar buildpackage_options=--git-pristine-tar
fi fi
if [ $uscan_download = "true" ]; then if [ $uscan_download = "true" ]; then
echo "no pristine-tar branch, trying uscan"; echo "no pristine-tar branch, trying uscan";
apt_get_auto_install gnupg2 libwww-perl; apt_get_auto_install gnupg2 libwww-perl;
uscan --verbose --download-current-version --force-download --rename; uscan --verbose --download-current-version --force-download --rename;
fi fi
else else
echo "building native package version $debversion" echo "building native package version $debversion"