On Tue, Jul 23, 2019 at 12:39:16PM +0200, Agustin Martin wrote: > Control: tags -1 -patch > > On Mon, Jul 22, 2019 at 05:48:13PM +0100, James Clarke wrote: > > On 22 Jul 2019, at 17:16, Agustin Martin <[email protected]> wrote: > > > However, when using pdebuild --auto-debsign to sign files, only .changes > > > file is signed, but not its _source.changes counterpart, which is the file > > > I would have to upload. This results in pbuilder not creating properly > > > uploadable packages once source-only uploads are mandatory for bullseye. > > > This is why I use severity "important".
I am attaching a minimal patch that just reverses check ordering, trying source.changes first and arch.changes later. I have been also playing with changes caring about SOURCE_ONLY_CHANGES, but they need more ellaboration. Regards, -- Agustin
>From 11a475a3b5996939fc9a33514b005c2db3f1e19b Mon Sep 17 00:00:00 2001 From: Agustin Martin Domingo <[email protected]> Date: Thu, 26 Sep 2019 11:21:54 +0200 Subject: [PATCH] pdebuild: If --auto-debsign, try source.changes first if present, arch.changes otherwise. --- pdebuild | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pdebuild b/pdebuild index 7d5f5ed..7ecb59f 100644 --- a/pdebuild +++ b/pdebuild @@ -113,12 +113,12 @@ if [ "${AUTO_DEBSIGN}" = "yes" ]; then if [ -n "${DEBSIGN_KEYID}" ]; then DEBSIGN_PARAM[1]="-k${DEBSIGN_KEYID}" fi - if [ -f "${BUILDRESULT}/${CHANGES}" ]; then - DEBSIGN_PARAM[2]="${BUILDRESULT}/${CHANGES}" - elif [ -f "${BUILDRESULT}/${SOURCE_CHANGES}" ]; then + if [ -f "${BUILDRESULT}/${SOURCE_CHANGES}" ]; then DEBSIGN_PARAM[2]="${BUILDRESULT}/${SOURCE_CHANGES}" + elif [ -f "${BUILDRESULT}/${CHANGES}" ]; then + DEBSIGN_PARAM[2]="${BUILDRESULT}/${CHANGES}" else - log.e "the .changes file can't be found, debsign not done" + log.e "the {source,arch}.changes file can't be found, debsign not done" exit 1 fi debsign "${DEBSIGN_PARAM[@]}" -- 2.24.0
