From 0c990abc4886bdc1bc67ef6560da7e2348dcb68b Mon Sep 17 00:00:00 2001 From: Johannes 'josch' Schauer Date: Sun, 15 Nov 2020 11:30:04 +0100 Subject: [PATCH] coverage.sh: only consider non-POD parts for maximum line length check --- coverage.sh | 2 +- mmdebstrap | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/coverage.sh b/coverage.sh index 4afb295..5c6beb6 100755 --- a/coverage.sh +++ b/coverage.sh @@ -13,7 +13,7 @@ if [ "$ret" -ne 0 ]; then fi rm "$TMPFILE" -if [ $(wc -L < mmdebstrap) -gt 79 ]; then +if [ $(sed -e '/^__END__$/,$d' mmdebstrap | wc --max-line-length) -gt 79 ]; then echo "exceeded maximum line length of 79 characters" >&2 exit 1 fi diff --git a/mmdebstrap b/mmdebstrap index 87a4098..404a1d1 100755 --- a/mmdebstrap +++ b/mmdebstrap @@ -6346,8 +6346,7 @@ If you don't want this behaviour, you can override it by manually specifying a mirror in various different ways: $ mmdebstrap stable stable-chroot.tar http://deb.debian.org/debian - $ mmdebstrap stable stable-chroot.tar \ - "deb http://deb.debian.org/debian stable main" + $ mmdebstrap stable stable-chroot.tar "deb http://deb.debian.org/debian stable main" $ mmdebstrap stable stable-chroot.tar /path/to/sources.list $ mmdebstrap stable stable-chroot.tar - < /path/to/sources.list @@ -6412,8 +6411,7 @@ Use as replacement for autopkgtest-build-qemu and vmdb2: $ mmdebstrap --variant=important --include=linux-image-amd64 \ --customize-hook='chroot "$1" passwd --delete root' \ - --customize-hook='chroot "$1" useradd --home-dir /home/user - --create-home user' \ + --customize-hook='chroot "$1" useradd --home-dir /home/user --create-home user' \ --customize-hook='chroot "$1" passwd --delete user' \ --customize-hook='echo host > "$1/etc/hostname"' \ --customize-hook='echo "127.0.0.1 localhost host" > "$1/etc/hosts"' \