man un-diverting man idempotent

This commit is contained in:
Michael Hudson-Doyle 2018-06-06 10:51:35 +12:00
parent 7c7c2c5b30
commit 664ace2f30
2 changed files with 7 additions and 5 deletions

2
debian/changelog vendored
View File

@ -1,4 +1,4 @@
livecd-rootfs (2.529~ppa4) cosmic; urgency=medium livecd-rootfs (2.529~ppa6) cosmic; urgency=medium
* Improvements to the ubuntu-base (i.e. Docker) build: * Improvements to the ubuntu-base (i.e. Docker) build:
- Customize the unminimize script to not install ubuntu-minimal. - Customize the unminimize script to not install ubuntu-minimal.

View File

@ -153,9 +153,11 @@ if [ -f /etc/dpkg/dpkg.cfg.d/excludes ] || [ -f /etc/dpkg/dpkg.cfg.d/excludes.dp
fi fi
fi fi
if [ "$(dpkg-divert --truename /usr/bin/man)" = "/usr/bin/man.REAL" ]; then
# Remove diverted man binary # Remove diverted man binary
rm -f /usr/bin/man rm -f /usr/bin/man
dpkg-divert --quiet --remove --rename /usr/bin/man dpkg-divert --quiet --remove --rename /usr/bin/man
fi
EOF EOF
if [ "$PROJECT" != "ubuntu-base" ]; then if [ "$PROJECT" != "ubuntu-base" ]; then