git: 613a0476fffb - main - devel/qt5: avoid POST-DEINSTALL error messages
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 14 Apr 2022 16:17:22 UTC
The branch main has been updated by adridg:
URL: https://cgit.FreeBSD.org/ports/commit/?id=613a0476fffb84ebab668d4737575c1280024b2e
commit 613a0476fffb84ebab668d4737575c1280024b2e
Author: Adriaan de Groot <adridg@FreeBSD.org>
AuthorDate: 2022-04-14 15:49:13 +0000
Commit: Adriaan de Groot <adridg@FreeBSD.org>
CommitDate: 2022-04-14 16:17:18 +0000
devel/qt5: avoid POST-DEINSTALL error messages
The deinstall script needs to check if QtCore/qconfig.h exists.
If it doesn't, then Qt as a whole is being deinstalled. However,
if it *does* exist, then the shell command `[ ! -e QtCore/qconfig.h ]`
exits with a non-zero exit code. In the deinstall script, that
was the last pipeline in the script and so the script ends up with
that as exit code. Suppress this bogus failure by adding : (true)
to the end of the deinstall script.
I'm specifically **not** bumping any PORTREVISIONs. The deinstall
message is harmless (if confusing) and rebuilding all the Qt packages
for a one-character change to suppress a harmless message seems
like overkill. They will doubtless be rebuilt soon for some
dependency change anyway.
---
devel/qt5/files/pkg-change.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/devel/qt5/files/pkg-change.in b/devel/qt5/files/pkg-change.in
index a55ad00e3f40..6a49140ffa87 100644
--- a/devel/qt5/files/pkg-change.in
+++ b/devel/qt5/files/pkg-change.in
@@ -79,7 +79,7 @@
@deinstall [ \! -e "$qc" ] && touch "$qc"
@deinstall sed -i "" "/qconfig-$qm\.h/ d" "$qc"
##
-## When qtcore is removed, the whole config dir can go away as well.
+## When qtcore is removed, the whole config dir can go away as well ..
##
@deinstall [ \! -e "$qi/QtCore/qconfig.h" ] && \
@deinstall [ \! -s "$qc" ] && (
@@ -88,5 +88,8 @@
@deinstall rmdir "$qi"
@deinstall ) > /dev/null 2>&1
##
+## .. but if it isn't removed, that's ok: suppress a non-zero exit code.
+##
+@deinstall :
@deinstall ;;
esac