Hi Russ,
On Thu, Aug 21, 2014 at 11:27:36AM -0700, Russ Allbery wrote:
> Guido Günther <a...@sigxcpu.org> writes:
>
> >> if [ -n "`ls ../*_source.changes`" ] ; then
> >> rm ../*_source.changes
> >> fi
>
> > Yeah, for the -S case this hould probably be skipped. Russ?
>
> Yes, it definitely should. I'll hopefully get a chance to look at this in
> a few days once I'm at Debconf, but feel free to beat me to it.
I took a stab at this in gbp with the attached patch.
Cheers,
-- Guido
>From 6edd8363eab02832f8bb58f3405609503b6458af Mon Sep 17 00:00:00 2001
Message-Id: <6edd8363eab02832f8bb58f3405609503b6458af.1409044589.git....@sigxcpu.org>
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <a...@sigxcpu.org>
Date: Tue, 26 Aug 2014 11:08:27 +0200
Subject: [PATCH] Don't delete *_source.changes on source only builds
Closes: #758726
---
bin/git-pbuilder | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index 4024d12..37ffe67 100644
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -265,6 +265,7 @@ fi
# them from the shell since they'll undergo another round of shell expansion
# when the pbuilder runs debbuild.
for arg in "$@" ; do
+ [ "$arg" != "-S" ] || source_only=true
DEBBUILDOPTS+=" $(shell_quote "$arg")"
done
@@ -278,7 +279,7 @@ else
--debbuildopts "$DEBBUILDOPTS" -- "${OPTIONS[@]}"
fi
status="$?"
-if [ -n "`ls ../*_source.changes`" ] ; then
+if [ -n "`ls ../*_source.changes`" -a $source_only != 'true' ] ; then
rm ../*_source.changes
fi
exit "$status"
--
2.1.0.rc1
