From nobody Thu Apr 14 16:17:22 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 80E8D1B4EF62; Thu, 14 Apr 2022 16:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KfPkB38hvz3R46; Thu, 14 Apr 2022 16:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649953042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4exYgko+Oav+GmfdGMBokoSTqTBaKTIVodqF53DZ32M=; b=uheL4JEpHEEKKwuBSE9KOGifYO9i6F1lxPOj1GNnCO3y7YqweTipJvE3q2DW7p9BsV9ivL zX2YZDcBB/CRs59c0TC1k58+YuhriQm3gVInHD/i/hWvYVlP9ET8J2X2nHWtsLG1ygl3tY Sb3nJHop8fUUje7/arvIy47sXaYEVJW3qO8WA7exjgTc8mWBa6K2mQv7oqQFo5jSnC4862 EDgQKCvqEoPg7+mDzYYwz+6d+bWOd4Vfyk8NXCTgEZNsj6I3gJ2TAT5t8eyVv0N6FDGTDC e5TwRvN5WT5M7MEMRZ0cwrngYHnyPiSYGzri973U3e+RgOv3XMgwsF9I37Ox3g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3CFA9238D1; Thu, 14 Apr 2022 16:17:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23EGHMO7070445; Thu, 14 Apr 2022 16:17:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23EGHMC2070444; Thu, 14 Apr 2022 16:17:22 GMT (envelope-from git) Date: Thu, 14 Apr 2022 16:17:22 GMT Message-Id: <202204141617.23EGHMC2070444@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 613a0476fffb - main - devel/qt5: avoid POST-DEINSTALL error messages List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 613a0476fffb84ebab668d4737575c1280024b2e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649953042; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4exYgko+Oav+GmfdGMBokoSTqTBaKTIVodqF53DZ32M=; b=gBjUm9vxdpbdNV6fNAeHkYeMo3fdgp9X3yhShlWDgYzWKLRkTfCTWWJ6TcaK7v24xex0qa xrl81OIUne8PpQ37kjLIyu2ofv2SOMCEGTjwjEn5j1OhB8+UNsKrCIc7I0xMT5QA6Nehze tVnYBggsjNuU4Hal7XwZ5Zr3h3bLRrMaI+6r3Kac9zlxeMKeCNqFeK+hDbkQA2QBEbkCgV wWQMelgMra7QGZbwrubK3fM04UpwbaRXLf5+gJ9ZpMZvboK9Glej7NX52Z7VE4JDuDnPWM KwXNEtbX52IVUTJH5xQmTBVnCW9fUG2YLzjbflSsjb5/orl/Ar91H3wZze4KhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649953042; a=rsa-sha256; cv=none; b=v8IjWt3DbbWqrwMWvNWU1MJD1roPRAtU7U7sbl7NyBIMxo2ffIlnWxiJzRk63547+meLAv 13ZQtssdznUjjyKO9qDYvjPGAQr7r70TZaAuoXNnWiOuMoB97jLiO3H1pe2H3LrmLBOG74 KJ7KXJFZvCilGcM0B65MOPxnYhGeqop2WzqtwQjLgtvjPORc5DiTEx/ObeLp93mLA3QNPP pGmJ4XleTnrV8oLIlBV7vVcup2l3K+5hroWJN7kdcOPCDXLRcWh9CzdFiLw0Sm9aqoUfqL B+pFlN6q2EvECa779PaU+oAmCeFw1ynVCrVhA5xJ/ybTQBQ3y7Clx/8inHITKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=613a0476fffb84ebab668d4737575c1280024b2e commit 613a0476fffb84ebab668d4737575c1280024b2e Author: Adriaan de Groot AuthorDate: 2022-04-14 15:49:13 +0000 Commit: Adriaan de Groot 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