forked from josch/mmdebstrap
tests: skip debootstrap tests variant - on oldstable because of #917773
This commit is contained in:
parent
1ffa32f590
commit
dd774b4f20
3 changed files with 3 additions and 18 deletions
|
@ -3,18 +3,21 @@ Dists: any
|
|||
Variants: minbase buildd -
|
||||
Needs-Root: true
|
||||
Needs-APT-Config: true
|
||||
Skip-If: variant == "-" and dist == "oldstable" #917773
|
||||
|
||||
Test: check-against-debootstrap-dist
|
||||
Dists: any
|
||||
Variants: minbase buildd -
|
||||
Needs-Root: true
|
||||
Needs-APT-Config: true
|
||||
Skip-If: variant == "-" and dist == "oldstable" #917773
|
||||
|
||||
Test: as-debootstrap-unshare-wrapper
|
||||
Modes: unshare
|
||||
Needs-Root: true
|
||||
Variants: minbase -
|
||||
Needs-APT-Config: true
|
||||
Skip-If: variant == "-" and dist == "oldstable" #917773
|
||||
|
||||
Test: help
|
||||
|
||||
|
|
|
@ -89,7 +89,6 @@ rm /tmp/debian-mm/var/cache/apt/archives/lock
|
|||
rm /tmp/debian-mm/var/lib/apt/lists/lock
|
||||
rm /tmp/debian-mm/var/lib/dpkg/arch
|
||||
|
||||
# workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773
|
||||
# also needed for users that are created by systemd-sysusers before systemd 252
|
||||
# https://github.com/systemd/systemd/pull/24534
|
||||
for f in shadow shadow-; do
|
||||
|
|
|
@ -183,23 +183,6 @@ if [ "{{ VARIANT }}" = "-" ]; then
|
|||
esac
|
||||
fi
|
||||
|
||||
# workaround for https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=917773
|
||||
case {{ DIST }} in oldstable|stable)
|
||||
for f in shadow shadow-; do
|
||||
if [ ! -e /tmp/debian-{{ DIST }}-mm/etc/$f ]; then
|
||||
continue
|
||||
fi
|
||||
if ! cmp /tmp/debian-{{ DIST }}-debootstrap/etc/$f /tmp/debian-{{ DIST }}-mm/etc/$f >&2; then
|
||||
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/$f > /tmp/debian-{{ DIST }}-mm/etc/$f.bak
|
||||
cat /tmp/debian-{{ DIST }}-mm/etc/$f.bak > /tmp/debian-{{ DIST }}-mm/etc/$f
|
||||
rm /tmp/debian-{{ DIST }}-mm/etc/$f.bak
|
||||
else
|
||||
echo no difference for /etc/$f on {{ DIST }} {{ VARIANT }} >&2
|
||||
fi
|
||||
done;;
|
||||
esac
|
||||
|
||||
# check if the file content differs
|
||||
diff --unified --no-dereference --recursive /tmp/debian-{{ DIST }}-debootstrap /tmp/debian-{{ DIST }}-mm >&2
|
||||
|
||||
|
|
Loading…
Reference in a new issue