From 9fb94c45f4a7656b227299e93f925d542c0f2097 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Tue, 21 Nov 2017 22:19:17 +0100 Subject: gbp-try-ff: don't rely on options from ~/.gbp.conf --- examples/gbp-try-ff | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/examples/gbp-try-ff b/examples/gbp-try-ff index f8cfb409..f7cfc4c5 100755 --- a/examples/gbp-try-ff +++ b/examples/gbp-try-ff @@ -7,7 +7,13 @@ set -e git checkout debian/sid gbp pq import --force git checkout debian/sid -gbp import-orig --uscan --no-interactive +set +e +gbp import-orig --uscan --no-interactive --no-pristine-tar +ret=$? +set -e +if [ $ret = 4 ]; then + exit 0 +fi if ! gbp pq rebase; then echo "Automatic rebase failed" @@ -17,4 +23,10 @@ fi gbp pq export --commit gbp dch -S -a -gbp buildpackage --git-ignore-new +gbp buildpackage --git-pbuilder \ + --git-ignore-new \ + --git-no-pristine-tar \ + --git-postbuild='lintian $GBP_CHANGES_FILE' \ + -nc \ + ${GBP_BUILDPACKAGE_ARGS} + -- cgit v1.2.3