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

Merge branch 'master' into 'master' 

Fix uscan regression

Closes #5

See merge request salsa-ci-team/ci-image-git-buildpackage!7
This commit is contained in:
Hans-Christoph Steiner 2019-08-26 11:20:59 +00:00
parent 9387318146 2dd560d329
commit c562688695
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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