Message ID | 20181211045144.13256-1-eschwartz@archlinux.org |
---|---|
State | Accepted, archived |
Headers | show
Return-Path: <pacman-contrib-bounces@lists.archlinux.org> Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 028CD964C66F for <patchwork@archlinux.org>; Tue, 11 Dec 2018 04:52:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00=-1, DKIMWL_WL_HIGH=-0.228,DKIM_SIGNED=0.1,DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-BL-Results: <dns:149.230.143.63.zen.spamhaus.org> [127.0.0.10] <dns:1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.7.8.0.6.0.6.1.0.8.f.4.0.1.0.a.2.list.dnswl.org> [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 <patchwork@archlinux.org>; Tue, 11 Dec 2018 04:52:19 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 7DE6EF4B42348 for <patchwork@archlinux.org>; Tue, 11 Dec 2018 04:52:18 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (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 for <patchwork@archlinux.org>; Tue, 11 Dec 2018 04:52:18 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 69B3C20792; Tue, 11 Dec 2018 04:52:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1544503938; bh=M3hdNQaxDB11PwvLJPItuTHdpgEpVOETElXa2N8uFjM=; h=From:To:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe; b=JJhkGTWSMzi9ZPyprZkXz2fl/H67NKsbqmL1Unh4qH1UnXY3CkXrbuqnySlEfBrSN VUlRkLxVNRcZKnSnhUUnbs+MixQJhYgn85EN8w0mBTsLWE6UJ81e+CSreeu+MH3W/L VQ0pIUf9IJvovzFsQaJiPlve86xOosegJBllcjyewYBVVm/fxoocDkL5pmVA2wRTjI /V9Tuvzy0Oxjx1BE3jYmaGJsafqXcsr1WKKYunv6jwGCzgdXcGFJxrnQLW5Ge162kM 7E2iytie7vQvG62mB5BzcEMLGwZhzENGwB3qjyGaQR+1MaDs5u2EU4lY3C1oAdiDr4 okn446eU5p6hONSRR/HUiLTmA8jd9IKZj6my16rq+7U9FwgErEXBYNeRK+FKuQDkIm eY34XT5bYSjuNIBJYhhBJV08LXuP9lqWOoFkz9daMLkbL3WB6iFddTbM2KTimvpqni W/7QOtH36DnlaXk7KfMke4M/mMRv4WbTsyIo2cfsH5RUnlEWTl5gCpeUpkjkbsAY8b t3QGkJ4XPjiSiF/S2fXfuBd59KbNwrgZecHRZOPDV6Pjntli8GZfOEJLi6TU8ENBtn w8numlX/e8sEio3g78TGNBF4bbMEfe1RoDXxxQs3XxKxPGVDs+9YLDt1id0CHUNWwj F2kf0BLlzMbxZCSwD5LXCQfE= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CE01720792 for <pacman-contrib@lists.archlinux.org>; Tue, 11 Dec 2018 04:52:16 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for <pacman-contrib@lists.archlinux.org>; Tue, 11 Dec 2018 04:52:16 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 9E98AF4B42203; Tue, 11 Dec 2018 04:52:15 +0000 (UTC) Received: from localhost.localdomain (ool-3f8fe695.dyn.optonline.net [63.143.230.149]) (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) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 8A3EFF4B4217F; Tue, 11 Dec 2018 04:52:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1544503935; bh=M3hdNQaxDB11PwvLJPItuTHdpgEpVOETElXa2N8uFjM=; h=From:To:Subject:Date; b=E/UCtZLipO/d9K8Rj9A1ESR0VnTEKNwNYKg4fPorW3lJ92AYfGOQjNbQEFBeikKY6 hBnpgA/T7hopsEovv1Dj2soUyguk9XEtFswxbf7U9S94hucXJGQFTr51UrZYg6WlN4 oVg+0MhkY6CGxko2G4ANYBGWOx4scieDY/29BYj10j473+hv4aE0hZJ56JxtXwM+GG C8LRzAlVNXkvIfyNd+m1qq2rAxiP+/VZq3hW2iNWeEXv8XVl3CXi62ebv1JXLi74rK ++9PKf/vH5JwT8lzcHby9KWinlQ3IC8ASne6aNwWagnJeN4HwjJNHcrnwX4va2Bd2t X1Dw7iGYhGwfxzAhHkfTlAqU7fSPkYQErwe9+YbyTgKrnQ00f1EJnmUTZV7Ax8emTq 3Av171Cf4yCg2tm/U/m6KpZQY89KXk7Lf8MAIaztttPaNBamOww2pHvLW6enJ0JVq3 8RD7rBuM8bua8/rtGacvS8ZGgrvQajEhotpX/TJm9s6vo3LfvXhDtjajngzodDhC4+ pyRIwxwxUaAlIIhdrkKUJUlXsnO4wSS741aDWsL/0jluCTmGKVHisye4Jvk9F05oNe 4Oqa1OSn56xnD8CRQ80zYxjhu6K9OCx74cIXzMcC7kACsI2Xo+U12HK62/kIyJWJHJ UtASOjWjyHSWCoIA9Ktx2OLw= From: Eli Schwartz <eschwartz@archlinux.org> To: pacman-contrib@lists.archlinux.org Subject: [pacman-contrib] [PATCH] pacdiff: don't assume the DBPath has a trailing slash Date: Mon, 10 Dec 2018 23:51:44 -0500 Message-Id: <20181211045144.13256-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion list for pacman-contrib development <pacman-contrib.lists.archlinux.org> List-Unsubscribe: <https://lists.archlinux.org/options/pacman-contrib>, <mailto:pacman-contrib-request@lists.archlinux.org?subject=unsubscribe> List-Archive: <https://lists.archlinux.org/pipermail/pacman-contrib/> List-Post: <mailto:pacman-contrib@lists.archlinux.org> List-Help: <mailto:pacman-contrib-request@lists.archlinux.org?subject=help> List-Subscribe: <https://lists.archlinux.org/listinfo/pacman-contrib>, <mailto:pacman-contrib-request@lists.archlinux.org?subject=subscribe> Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" <pacman-contrib-bounces@lists.archlinux.org> |
Series |
pacdiff: don't assume the DBPath has a trailing slash
|
expand
|
diff --git a/src/pacdiff.sh.in b/src/pacdiff.sh.in index 2702451..dbe94ec 100644 --- a/src/pacdiff.sh.in +++ b/src/pacdiff.sh.in @@ -142,7 +142,7 @@ if (( USE_PACDB )); then error "unable to read @sysconfdir@/pacman.conf" usage; exit 1 fi - pac_db="${DBPath:-@localstatedir@/lib/pacman/}local" + pac_db="${DBPath:-@localstatedir@/lib/pacman}/local" if [[ ! -d "${pac_db}" ]]; then error "unable to read pacman database %s". "${pac_db}" usage; exit 1
If pacman-conf returns a DBPath without a trailing slash, then the script will error out with: ERROR: unable to read pacman database /var/lib/pacmanlocal Which is obviously wrong. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- src/pacdiff.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)