From patchwork Wed Oct 23 06:13:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 1290 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 1D905149A1507 for ; Wed, 23 Oct 2019 06:14:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-3.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Wed, 23 Oct 2019 06:14:28 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 3CDAE1609AECE7; Wed, 23 Oct 2019 06:14:24 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Wed, 23 Oct 2019 06:14:24 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2A4202CF56; Wed, 23 Oct 2019 06:14:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1571811264; bh=qWAhkTjWFImRBr5ByB03XuNWQWn/Qt4a4aeY1mK4ljE=; h=From:To:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe; b=HjPlU838ClWn0j/xdK2tRBeM7QRL3JVo/qf/Fukzw6JZVtd656cagMRKtxXo/aeIy Zp+dhb0KyBFCtcRbS+d/NUHTemQ73vCUbrols6DzcyuYLa6l1j754Q6Tg1ER6LXDN/ imMtCprUBBzJubtEwjnrXcdSpGKWJEoWCvYya7UCI86CV++5UAecHbeUn7bDWmcF2l oTqAUwpHOzOXt5OTF4wM7WGx+8OaJ4ZiL7195zfuW/BvBcQ1NhkwwRLY1aGJgAas8i WOwwrFm0ukmNX5AQJRlDbp1wVwMSmquy+D+Q6u/2MgQBN7k5izudNlSkhvBV4nXBtq Nij4Khay3bCs9CC5I9spr5mksFKTi5sI0f11XnYBwQ9bW1L2aertp/XHGzkLGb+JQA sbKZHQ4RhmoZHgDbSZ5xJ9yEtozY6sROLu9HLKwUj1uxGsvL7pb6oUY2UB32Yoqheu xHDgqhCssbBSqmaZaVfbrHIip2PUyQxikAzoBC99s6JyoO/zvQCna4F0bMua+pwk/M mpHG7i27rGf11OrTiHq/HhppKYsmSLYEqY02h8H66amHJBA2tEwGMVCOfLCtrk1EGl Fv/4xqrsfFvcYLrPVmGJzSa40pfsvbYJIOvYh5S/S3Tn5hPPwj488ax3/+ybwQQo1H b7uphvZs2x3wgNTeK1HVqRd0= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id A88A32CF50 for ; Wed, 23 Oct 2019 06:14:20 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Wed, 23 Oct 2019 06:14:20 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 782C21609AECDD; Wed, 23 Oct 2019 06:14:19 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id ABCF41609AECDC; Wed, 23 Oct 2019 06:14:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1571811259; bh=qWAhkTjWFImRBr5ByB03XuNWQWn/Qt4a4aeY1mK4ljE=; h=From:To:Subject:Date:In-Reply-To:References; b=pwfBTEHwAk/Q2Kti3XfbXr7i8IaI59Zmv2MFwjGdqTA4m2XfkuKZX1z5Kuq87FtpF vDlB6v0wKfCc5dKnDX7/NL5MQGXe9BoDIa783kjzu19pVWvxqQFgXKyOjyL7YuGpUT er6rORAvbEDwXWEVkkipq+2XqfSa9jyZmShd86701xmUILveWqfmr+0Pt9xPPHkj2f Vp2LsbTRu/yt3ZN5BjOw0QnRX10wUMuKFKOPuOZnNlS/M2/9I9o/BmiTTQIu95Tk4s +kV9mw+KXT3xyFcQ0MrwlknLMnnKLxrbJePjV43SjoDJvwTxNiwrnBnWOXr3x1Xa2b yxZyobCufvokAYGtnllpDFPJHsMImKGuDm9CrmvtW3QPAOay3/cTpD1LHvkVFMfncg 7qPwf0ACTZLcHDELymS68kd8eMDtyTdntu6fxp4uJrFs1noBN3X6ksyn2k7Dbq7U/q uWh7PvSeZnHU75CZkYKnuW3hBpERrjz+f3E3k1/qDtx29S7nilQvnGS+53gzxzcFOZ XIGyCrriHt1Ar7JXB7p4v1empOjc0cHdEUl51Q7aSZR7EoKsN+bwlYA6GniaQk167x wUukz1+7ncJxg/Nj1OBzpXrgFVVfXZ4tVDXALjpyQRCTCPvNUa9Wp7k072YN+NhN8z ps0+X5osP1RrvDoiTUoiictY= From: Eli Schwartz To: pacman-contrib@lists.archlinux.org Subject: [pacman-contrib] [PATCH 4/4] checkupdates: exit 2 if no updates are available Date: Wed, 23 Oct 2019 02:13:59 -0400 Message-Id: <20191023061359.820902-4-eschwartz@archlinux.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191023061359.820902-1-eschwartz@archlinux.org> References: <20191023061359.820902-1-eschwartz@archlinux.org> MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" It's useful to distinguish the failure to find updates. This carries over the ability for pacman -Qu to return errors when no upgrades are available. At the same time, this should (unlike pacman -Qu) use its own unique return code, since checkupdates may error for a couple of reasons including download issues. Fixes FS#64219 Signed-off-by: Eli Schwartz --- doc/checkupdates.8.txt | 14 ++++++++++++++ src/checkupdates.sh.in | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/doc/checkupdates.8.txt b/doc/checkupdates.8.txt index ff10930..b1a94d8 100644 --- a/doc/checkupdates.8.txt +++ b/doc/checkupdates.8.txt @@ -39,6 +39,20 @@ Environment Overrides the default '/tmp' temporary directory. +Errors +------ +On exit, checkpkg will return one of the following error codes. + +0:: + Normal exit condition. + +1:: + Unknown cause of failure. + +2:: + No updates are available. + + See Also -------- linkman:pacman[8], linkman:pacman.conf[5] diff --git a/src/checkupdates.sh.in b/src/checkupdates.sh.in index eecb4a7..52f8899 100644 --- a/src/checkupdates.sh.in +++ b/src/checkupdates.sh.in @@ -109,7 +109,7 @@ if (( ${#updates[@]} )); then sudo pacman -Sw --noconfirm "${updates[@]%% *}" --dbpath "$CHECKUPDATES_DB" --logfile /dev/null fi else - exit 1 + exit 2 fi # vim: set noet: