From patchwork Sun Jan 13 19:25:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Johannes_L=C3=B6thberg?= X-Patchwork-Id: 946 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 4C74AA87ABF8 for ; Sun, 13 Jan 2019 19:25:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00=-1,DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,MAILING_LIST_MULTI=-1, RCVD_IN_DNSWL_LOW=-0.7 autolearn=ham autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.1] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sun, 13 Jan 2019 19:25:40 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id CECB6FF679962; Sun, 13 Jan 2019 19:25:34 +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; Sun, 13 Jan 2019 19:25:34 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B98F82BE9D; Sun, 13 Jan 2019 19:25:34 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=pass (1024-bit key) header.d=kyriasis.com header.i=@kyriasis.com header.b=cmW0vfNy Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 5C9B12BEA0 for ; Sun, 13 Jan 2019 19:25:33 +0000 (UTC) Received: from theos.kyriasis.com (theos.kyriasis.com [IPv6:2a01:7e00:e000:136::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sun, 13 Jan 2019 19:25:33 +0000 (UTC) Received: from theos.kyriasis.com (localhost [127.0.0.1]) by theos.kyriasis.com (OpenSMTPD) with ESMTP id 31168a86 for ; Sun, 13 Jan 2019 19:25:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyriasis.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=theos; bh=D9YpHJY2FcK dG93T7lNUO0D2C68=; b=cmW0vfNywQvzlQMK0k1qGv4XzX54wItRQ1uJflAJU25 le9SWof6fLZRJUAygcWdEx3R4XW9BLE4cLnNkKeTb7j8s+bEKx2mA6zGZIQlieHQ 9pVr6/qXKf3joMNbW/8YaEHG0Xk8hFWqu41I3n2JdTg+YACH85sXHNKIZX//VdpQ = DomainKey-Signature: a=rsa-sha1; c=nofws; d=kyriasis.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=theos; b=EYV45 NYC9GqgyvAbmaxuBDNLAOK6rF0JAcybg84tCAoTuhbnLfAgQt8HuNRoa0KxKAGep zEDOhDQngkA7gQdV9ogrZEWlVYJnn+6CiT8hwCdiXFRIiUHfY25ltoScsc1wJ5rQ wKbM3s6bZZjuhHc50jdp7DzCrIaT2cO1WvzkTk= Received: from hydrogen.kyriasis.com (h-52-10.A572.priv.bahnhof.se [158.174.52.10]) by theos.kyriasis.com (OpenSMTPD) with ESMTPSA id 0e9b5bee (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 13 Jan 2019 19:25:31 +0000 (UTC) From: =?utf-8?q?Johannes_L=C3=B6thberg?= To: pacman-contrib@lists.archlinux.org Subject: [PATCH 2/2] pacsort: Make fnmatch more lenient to allow everything makepkg allows Date: Sun, 13 Jan 2019 20:25:24 +0100 Message-Id: <20190113192524.25914-2-johannes@kyriasis.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190113192524.25914-1-johannes@kyriasis.com> References: <20190113191757.24638-1-johannes@kyriasis.com> <20190113192524.25914-1-johannes@kyriasis.com> 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: , Cc: =?utf-8?q?Johannes_L=C3=B6thberg?= Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Signed-off-by: Johannes Löthberg --- src/pacsort.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pacsort.c b/src/pacsort.c index 3a9fe9c..e9e49e3 100644 --- a/src/pacsort.c +++ b/src/pacsort.c @@ -213,7 +213,7 @@ static struct input_t *input_new(const char *path, int pathlen) return NULL; } - in->is_file = fnmatch("*-*.pkg.tar.?z", in->data, 0) == 0; + in->is_file = fnmatch("*-*.pkg.tar*", in->data, 0) == 0; if(!in->is_file) { return in; }