josch/mmdebstrap
2
3
Fork 6
Code Issues 8 Pull requests 1 Projects Releases Wiki Activity

tests/check-against-debootstrap-dist: avoid code duplication by using a loop

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2022-10-18 10:51:22 +02:00
parent eb7cf54155
commit 43ba07e790
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/check-against-debootstrap-dist
View file

@ -166,22 +166,21 @@ for log in faillog lastlog; do
done done
# workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773 # workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773
if ! cmp /tmp/debian-{{ DIST }}-debootstrap/etc/shadow /tmp/debian-{{ DIST }}-mm/etc/shadow >&2; then # also needed for users that are created by systemd-sysusers before systemd 252
echo patching /etc/shadow on {{ DIST }} {{ VARIANT }} >&2 # https://github.com/systemd/systemd/pull/24534
awk -v FS=: -v OFS=: -v SDE={{ SOURCE_DATE_EPOCH }} '{ print $1,$2,int(SDE/60/60/24),$4,$5,$6,$7,$8,$9 }' < /tmp/debian-{{ DIST }}-mm/etc/shadow > /tmp/debian-{{ DIST }}-mm/etc/shadow.bak for f in shadow shadow-; do
cat /tmp/debian-{{ DIST }}-mm/etc/shadow.bak > /tmp/debian-{{ DIST }}-mm/etc/shadow if [ ! -e /tmp/debian-{{ DIST }}-mm/etc/$f ]; then
rm /tmp/debian-{{ DIST }}-mm/etc/shadow.bak continue
else
echo no difference for /etc/shadow on {{ DIST }} {{ VARIANT }} >&2
fi fi
if ! cmp /tmp/debian-{{ DIST }}-debootstrap/etc/shadow- /tmp/debian-{{ DIST }}-mm/etc/shadow- >&2; then if ! cmp /tmp/debian-{{ DIST }}-debootstrap/etc/$f /tmp/debian-{{ DIST }}-mm/etc/$f >&2; then
echo patching /etc/shadow- on {{ DIST }} {{ VARIANT }} >&2 echo patching /etc/$f on {{ DIST }} {{ VARIANT }} >&2
awk -v FS=: -v OFS=: -v SDE={{ SOURCE_DATE_EPOCH }} '{ print $1,$2,int(SDE/60/60/24),$4,$5,$6,$7,$8,$9 }' < /tmp/debian-{{ DIST }}-mm/etc/shadow- > /tmp/debian-{{ DIST }}-mm/etc/shadow-.bak awk -v FS=: -v OFS=: -v SDE={{ SOURCE_DATE_EPOCH }} '{ print $1,$2,int(SDE/60/60/24),$4,$5,$6,$7,$8,$9 }' < /tmp/debian-{{ DIST }}-mm/etc/$f > /tmp/debian-{{ DIST }}-mm/etc/$f.bak
cat /tmp/debian-{{ DIST }}-mm/etc/shadow-.bak > /tmp/debian-{{ DIST }}-mm/etc/shadow- cat /tmp/debian-{{ DIST }}-mm/etc/$f.bak > /tmp/debian-{{ DIST }}-mm/etc/$f
rm /tmp/debian-{{ DIST }}-mm/etc/shadow-.bak rm /tmp/debian-{{ DIST }}-mm/etc/$f.bak
else else
echo no difference for /etc/shadow- on {{ DIST }} {{ VARIANT }} >&2 echo no difference for /etc/$f on {{ DIST }} {{ VARIANT }} >&2
fi fi
done
# check if the file content differs # check if the file content differs
diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2 diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2