From patchwork Sun Mar 28 07:45:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel M. Capella" X-Patchwork-Id: 1886 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.17) for (single-drop); Sun, 28 Mar 2021 08:32:24 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id 89d1ORc/YGDOqgAAK+/4rw (envelope-from ) for ; Sun, 28 Mar 2021 08:32:23 +0000 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) server-digest SHA256) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 4EF234B424E; Sun, 28 Mar 2021 08:32:23 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E00EE2B77A; Sun, 28 Mar 2021 08:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1616920342; bh=OnEomcBCXNnvxJ4Lk4BI+Xd2dV2u+smlUFja+e/kg9I=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=l8IpS8yBJogDv/3VDwVQ+R2Cqoe/XMGT/JF2GEWS4eKU72QEpMLj64r7ER4FgeGzF TtMulBNsxx+xN+p0lb6CQPtj8OuPNx7ZK7/SUz3h12wXwG4C89Bm8QMPBRJ91g7V7l 5ur0C29qPlaPt6YWBLEGhs0YNiCVZCRCpx6NxedLyRspVBLDOJ+iBHvuiDRRASCtUE JcXrusTvqcjtEMFjEBgIsMQhmeYRruasd7Du1m2lD6WhvVwzadwBtF38CZ040/cCT4 CqFcoFZyz8el2oryZu578d9T7BPw1vSkVMg2S94ChNr3Wd44eklwRxBMZLVSo66Chl 0FPN3vLawxR6TrfgNkuZ9y3mUuqDA63nvB/m5zW+EYn728p1zj14v+Pd0JZ4PLHfQu FezKKeLcCQn4oln3mcv229FU6PfifosPh8UdJQmjDeBTp2wu3PNUmo0jUHhMsG7/aR klY5QMhV+vK+o8jP+vt681upLjRF+mVTzgvqMsxv/ogAbI7elloTJgp7TRXxBqfKKs lCYDF4wiiDQ0kKhRTkuRtzSpHNTUGjkCp3BhMRgrmvoBxnQ/Z7RPJKEaAHajCvepkR Oj7wEiNTQuHPmL9dlLb4gbwXDP+ET11dkqlOP2l3+4s7AG3FSRXrGG7IZ/+Q8wW9oz tUjf8/ezRPAuT/BwwZcK+U3c= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 1434523DD8 for ; Sun, 28 Mar 2021 07:46:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,RCVD_IN_MSPIKE_H4=0.001,RCVD_IN_MSPIKE_WL=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=failed autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.2] [127.0.0.19] Received: from mail.archlinux.org (mail.archlinux.org [95.216.189.61]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 28 Mar 2021 07:46:04 +0000 (UTC) To: pacman-contrib@lists.archlinux.org Subject: [PATCH] pacdiff: Fix regression in check for merge status Date: Sun, 28 Mar 2021 03:45:54 -0400 Message-Id: <20210328074554.58319-1-polyzen@archlinux.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "Daniel M. Capella via pacman-contrib" From: "Daniel M. Capella" Reply-To: Discussion list for pacman-contrib development Cc: "Daniel M. Capella" Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=l8IpS8yB; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 4EF234B424E X-Spamd-Result: default: False [2.79 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; TO_DN_SOME(0.00)[]; R_MISSING_CHARSET(2.50)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_COUNT_THREE(0.00)[4]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; MAILLIST(-0.20)[mailman]; FORGED_RECIPIENTS_MAILLIST(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/29, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; FROM_HAS_DN(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; HAS_LIST_UNSUB(-0.01)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org Signed-off-by: Daniel M. Capella --- src/pacdiff.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 674892b..004203f 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -122,7 +122,8 @@ merge_file() { merged="$($SUDO mktemp "$tempdir"/"$basename.merged.XXX")" tar -xOf "$base_tar" "${file#/}" | $SUDO tee "$base" > /dev/null - if $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null; then + $SUDO $mergeprog "$file" "$base" "$pacfile" | $SUDO tee "$merged" > /dev/null + if [ "${PIPESTATUS[0]}" -ne "1" ]; then msg2 "Merged without conflicts." fi