From patchwork Fri Jan 3 21:57:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward E X-Patchwork-Id: 1430 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 32BBA160B0FF8 for ; Sun, 5 Jan 2020 12:48:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.3 (2019-12-06) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FROM=0.5, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01,T_DMARC_SIMPLE_DKIM=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [127.0.0.10, 127.0.0.4] [127.0.0.14] [127.0.9.0] Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 5 Jan 2020 12:48:45 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 5243A17D8E89CB; Sun, 5 Jan 2020 12:48:40 +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) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id 0D38817D8E89C3; Sun, 5 Jan 2020 12:48:39 +0000 (UTC) Authentication-Results: orion.archlinux.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k6nWNLL9 Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id CEFC32BE67; Sun, 5 Jan 2020 12:48:39 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=k6nWNLL9 Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 665292B398 for ; Fri, 3 Jan 2020 21:58:26 +0000 (UTC) Received: from mail-yb1-xb2b.google.com (mail-yb1-xb2b.google.com [IPv6:2607:f8b0:4864:20::b2b]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 3 Jan 2020 21:58:26 +0000 (UTC) Received: by mail-yb1-xb2b.google.com with SMTP id v24so19219479ybd.10 for ; Fri, 03 Jan 2020 13:58:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2PkriftGT17ArJ6u+m+7hHJ4j55VlaalZ+d5IAtfhAs=; b=k6nWNLL9l6ltx5Vqk7XtDdmbN6LVVaWDQcAJP0xDfJ5C5LNBJhzaaTd4kL2zB73VmL oBz/R/jAhvujl/GbhPGPAoUNuH6rCWyYZxiGz3f8xpzf8LmA/f6iQo176dOOaI1P2i+5 Nh3gydhZrfyKb7ml+t/KrrpfNKci4AD9SrKZf6KuvY5tpFc6SnZNTszC34WrldI5rXi/ 6oN1Hp6q3/MvFeCNkloLv8nOxoNVHtRhgiKv46RRCIav9lIYbCMecmBAmlMPYsr66Nx9 untTFYdk+lXZg/W7F2cLbnQCSc4H/QFGppF/UTo40HqBeJ1sywn0m8yTZJdTs2qrqAMk XfrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2PkriftGT17ArJ6u+m+7hHJ4j55VlaalZ+d5IAtfhAs=; b=HSMPCriMo21f/wK3/n0H7qGn09dMnhLxtHFF0e8Pn3Yo70sKjLA7TDbjjFmNnZf/3d Fja6pZmuZe7WEzT6fICFxTpiySzGmXm9l1PYTw5cQ8p2euQtbCCCEr6hG5j9c/I2C4dg 5LTTMD5ik+HleSalTs2iLa1wuwLWWgiIdX4Fc2wnCeqQ0AFR5GHkRzZfS9P1u2ab7WLC OsC1K7AA1GviqE3K0y2xcvSGUDhTN6fw8H5iB7MT8ZYyVAhvmWBihhRmEYNUxivy2ZJt ik7rrZrxwec8qIEAlhIhFx9BYv/hxOvH5QyozgHQQqDQBfg51hsOyB7vkBXtMP5tLJjB ZnEg== X-Gm-Message-State: APjAAAUD1JhcY7X7eq1UzPHtM2QVQIxhLVQsx5U55NsXuLVfb0cfr2ih Vl1jfy9vO10qweEiBtfWOYqmA+Ik X-Google-Smtp-Source: APXvYqw/XBWzOZLxlwJQpFrcjbOcIJcCHQOAI/7Fjh7WS0bfNSFTDBRjLpN1ae14v2UqFbIPcbI2Pg== X-Received: by 2002:a5b:c82:: with SMTP id i2mr64939739ybq.327.1578088705074; Fri, 03 Jan 2020 13:58:25 -0800 (PST) Received: from localhost.localdomain ([172.58.142.160]) by smtp.gmail.com with ESMTPSA id d137sm22404319ywd.86.2020.01.03.13.58.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jan 2020 13:58:24 -0800 (PST) From: Edward E To: pacman-contrib@lists.archlinux.org Subject: [PATCH 2/2] pactree: Set the gpg directory Date: Fri, 3 Jan 2020 15:57:00 -0600 Message-Id: <20200103215701.2814-2-develinthedetail@gmail.com> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20200103215701.2814-1-develinthedetail@gmail.com> References: <20200103215701.2814-1-develinthedetail@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 05 Jan 2020 12:48:38 +0000 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: , Cc: Edward E Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Addresses https://github.com/msys2/MSYS2-packages/issues/1720 Signed-off-by: Edward E --- src/Makefile.am | 4 +++- src/pactree.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 8d33be8..eef0590 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,6 +7,7 @@ DIST_SUBDIRS = $(SUBDIRS) # paths set at make time conffile = ${sysconfdir}/pacman.conf dbpath = ${localstatedir}/lib/pacman/ +gpgdir = ${sysconfdir}/pacman.d/gnupg/ bin_SCRIPTS = \ $(OURSCRIPTS) @@ -82,7 +83,8 @@ endif AM_CPPFLAGS = \ -DLOCALEDIR=\"@localedir@\" \ -DCONFFILE=\"$(conffile)\" \ - -DDBPATH=\"$(dbpath)\" + -DDBPATH=\"$(dbpath)\" \ + -DGPGDIR=\"$(gpgdir)\" AM_CFLAGS = \ -pedantic \ diff --git a/src/pactree.c b/src/pactree.c index 8b77f05..f7c4d39 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -125,6 +125,7 @@ static int searchsyncs = 0; static int debug = 0; static const char *dbpath = DBPATH; static const char *configfile = CONFFILE; +static const char *gpgdir = GPGDIR; void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) { @@ -545,6 +546,9 @@ int main(int argc, char *argv[]) alpm_option_set_logcb(handle, cb_log); } + /* no need to fail on error */ + alpm_option_set_gpgdir(handle, gpgdir); + if(searchsyncs) { if(register_syncs() != 0) { cleanup(1);