From patchwork Fri Feb 16 03:49:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 400 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 0E70C21921B8 for ; Fri, 16 Feb 2018 03:49:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.0.10] [127.0.0.10] [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 ; Fri, 16 Feb 2018 03:49:28 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 48A498AF387E2; Fri, 16 Feb 2018 03:49:17 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Fri, 16 Feb 2018 03:49:17 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2D7372BC3B; Fri, 16 Feb 2018 03:49:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1518752957; bh=0c82f/u9nTyU1KyW2eARpzfjq3UNfdZtYZaffvn257M=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=r+XhJ1JqvBq2DP/XM4utYWO76I/3W7rNPFDXcstiIadBtDpoKbG/Le+kkPDnFnhUo JYfWKXDpLU8frwaNSA1FPEQesWxDDD4qOfvKg2G62HBXSAaLrayZygQxZTyMvcoXZl lU11vykuwF1i73JGcyqz62k//EzrQjAB3toHM/+NfVwDXF3NJg9Ujyweg5kcoJmVFs 21/c4dxKJP6Ks2g3hlMttIhoEF5E2ujFaqQs2wWc8/WlL+v+hP5WfllIbADUREVL9g ODTVeRwYfwcjuUnUUhh9xiRz3NiLlZGvsHrw6tbIrcyErmmXIvlD/yTuW1VgYL/PVO XJTeQTZ4q0MLx4BI5RH+5H1Lnco0fH7R2MK1FxKpWKrKloRPloAdyeLBwP+5ig9fBV rhCqdByRlsqef4PVnvXVUmG3P0fR0KK6OLEOeY8+HIUrwBuIlu8gQSB9BlP765Oxy5 lQHm2B5kCcEtsFxD9Rwtob+MHTS/JToLazX1PcUxh4NB9NR56pMP7A4YzdSYytiqhU CK7FtLh7uKKkOHHMzXq9mqMbVDww8pCOVDq9JNuas+ZzfjOTnlbL7GlgHE6eUDZjnc Zskuw1RHBMTLYyE3R9GRM7icdvbDWf/wTSqRDLNHDQ9loThzdEJPPnI+qHzwe2GXO4 cUdnDP9V4+Nn9J9dmgI2a4u8= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 0E1E52BB50 for ; Fri, 16 Feb 2018 03:49:16 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 16 Feb 2018 03:49:16 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 8548E8AF387DC; Fri, 16 Feb 2018 03:49:03 +0000 (UTC) Received: from localhost.localdomain (ool-18bdf232.dyn.optonline.net [24.189.242.50]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id 0B9808AF387DB; Fri, 16 Feb 2018 03:49:02 +0000 (UTC) To: arch-projects@archlinux.org Date: Thu, 15 Feb 2018 22:49:26 -0500 Message-Id: <20180216034926.28424-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.16.1 Subject: [arch-projects] [dbscripts] [PATCH] test: fix misuse of $PKGEXT X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Eli Schwartz via arch-projects Reply-To: Arch Linux projects development discussion Cc: Eli Schwartz Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" As per the previous commits, this never worked and nobody noticed because the use of globbing was undocumented. Fortunately, we can fix that now, by using the new is_globfile() proxy function. Signed-off-by: Eli Schwartz --- test/cases/ftpdir-cleanup.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cases/ftpdir-cleanup.bats b/test/cases/ftpdir-cleanup.bats index 6280ce0..63eed03 100644 --- a/test/cases/ftpdir-cleanup.bats +++ b/test/cases/ftpdir-cleanup.bats @@ -13,8 +13,8 @@ __checkRepoRemovedPackage() { local pkgname for pkgname in $(__getPackageNamesFromPackageBase ${pkgbase}); do - [[ ! -f ${FTP_BASE}/${PKGPOOL}/${pkgname}-*${PKGEXT} ]] - [[ ! -f ${FTP_BASE}/${repo}/os/${repoarch}/${pkgname}-*${PKGEXT} ]] + ! is_globfile "${FTP_BASE}/${PKGPOOL}/${pkgname}"-*${PKGEXT} + ! is_globfile "${FTP_BASE}/${repo}/os/${repoarch}/${pkgname}"-*${PKGEXT} done }