[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: [PATCH:di-autobuild] buildscript: Adjust sed call for dpkg 1.18.3



Hi,

Cyril Brulebois <kibi@debian.org> (2015-09-28):
> This commit in dpkg led to a slightly variation in dpkg-checkbuilddeps's output:
> | commit d287060bb1a45f5de33eb27034a7d8b27b039dbb
> | Author: Guillem Jover <guillem@debian.org>
> | Date:   Thu Sep 17 18:14:00 2015 +0200
> |
> |     scripts: Use error() and errormsg() instead of printing on STDERR directly
> |
> |     This way any transformation done for error messages gets applied
> |     consistently to all error output.
> 
> The new pattern should support both variants.
> 
> Signed-off-by: Cyril Brulebois <kibi@debian.org>
> ---
>  buildscript | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Hi,
> 
> I'm not sure who exactly can pull this, so trying my luck with
> debian-wb-team@ for now.
> 
> (No need to tell me how ugly this is.)
> 
> Confirmed to work fine on barriere (except for libpango's udeb being
> uninstallable).
> 
> Thanks for your time.
> 
> Mraw,
> KiBi.
> 
> 
> diff --git a/buildscript b/buildscript
> index fb35920..f787db4 100755
> --- a/buildscript
> +++ b/buildscript
> @@ -60,7 +60,7 @@ install_build_deps() {
>    dd-schroot-cmd -c "$SID" apt-get update
>    (
>      LANG=C schroot -q -c "$SID" -d "$HOME/di/build/$(basename "$INSTALLER_DIR")/checkout/build" -p -r -- dpkg-checkbuilddeps -B ../debian/control 2>&1 || true
> -  ) | sed -e 's%dpkg-checkbuilddeps: Unmet build dependencies: %%' -e 's, *([^)]*),,g' \
> +  ) | sed -e 's%dpkg-checkbuilddeps: \(error: \)*Unmet build dependencies: %%' -e 's, *([^)]*),,g' \
>      | DEBIAN_PRIORITY=critical DEBIAN_FRONTEND=noninteractive xargs dd-schroot-cmd -c "$SID" -y apt-get install
>  }

It's been a few days without any daily builds so I've decided to apply
my patch on all linux and kfreebsd porterboxes, after adjusting some
bits:
 - missing http.sslCAinfo parameter on one;
 - missing merge from origin/porterbox for some.

I'll take care of git rebasing (or resetting) all of them once a patch
lands into origin.

Since I've applied this a few hours after the usual “0 0” crontab entry,
I've manually started builds as well. Stuff should show up on the d-i
daily build overview page soon:
  http://d-i.debian.org/daily-images/daily-build-overview.html

Mraw,
KiBi.

Attachment: signature.asc
Description: Digital signature


Reply to: