From patchwork Tue Feb 4 19:53:55 2020 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: 1490 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 F197916DAB5BB for ; Tue, 4 Feb 2020 19:54:26 +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=-1.1 required=5.0 tests=DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_NONE=-0.0001,SPF_HELO_NONE=0.001, T_DMARC_POLICY_NONE=0.01 autolearn=ham autolearn_force=no version=3.4.3 X-Spam-BL-Results: [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 ; Tue, 4 Feb 2020 19:54:26 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 10FDC18A3E23A9; Tue, 4 Feb 2020 19:54:23 +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 CBBD318A3E23A2; Tue, 4 Feb 2020 19:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=orion; t=1580846062; bh=JnCxK6jpxaCfJXVnB0zVhciDvkljyO+2e3c8e+rktBE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=ARUx4gw77pw1URIt739QPb0oDnuH/xzBz6F74h7987ZSyEo1ch24dEik563Emo3Ka 5DXTjYII+TlwtPw7kVwgwLMb1Yb7jpobXzLoJO/nZeWh7GJwXeD3vbbNy/mXQqOPEa bFvLQaNExEBn0Qk9FgVxOxunPw5VQPRQt2y9gYubkD64P2NrDwXvc2iapWU4VAGxRf oIDPQpHz0moWQKzic3+B/qkzeanM/MAMDhQXXdsx5vlShm+ZO7e0LpuvxHgQmJz5g+ 6kynxxbhhM/UxnGXcwr7vZdHKGR/vEC6JPnGJyU4rr4+RaOlVZk8ex7GxyMu3nuHkc /4UWz/eiYIGx1OTRFkIYVmks4r9xwKBWb8BJJ2trB6uBxotv1g+IDk8Pi6SIcqwr9d QBN+AakX3QQ2T7GAI69aLkHyUz6NeuPwXE5EpSuY+8AdUYUhULu9jTruM0xsZGJRls PyUed5Nz8bT/1j1Zu3mtdfQ+GPufRAZonWPPuzXiZ3eiVC4iRyPIayrpmmXAKc5zrw TQkRolWp8OZRa4bodDz9hkSjoS9ZgXX5RpIXLqEb8XFU91GyguJzf+FL+uAjGKhlKo TYcBuAEzPgagspmOQg5uGA1ozOQWkrZ+SMvvBhqC2/j5sjR3pg3ARwmhRdwQYhqucU YEgm4alnqZPsBQC/bkqFrFrw= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id B63A02BE52; Tue, 4 Feb 2020 19:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1580846062; bh=JnCxK6jpxaCfJXVnB0zVhciDvkljyO+2e3c8e+rktBE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=gHnjVXWUmFqeRX+RncP0hqHs6HNygfQE09zqFjafCkS9hJZBig0N0c1KuTA6FAioz m4TYdbQ9lnAwRzHUIWj2uhrAExU4Elh+QvT9ryQE6l6zH74JuTvUj95PKoMC/bPysL j9wPoawHGi0dtBxFb3d5PlP5DudZAibi456FFi4mpZSy7obEpESId7nnOUStvpVz1O pvH2ePvHfk5BBht3VvzGYkELtb26KlmdNhHTcrX5OBLqwQXJlWbGzS18Rn4OjH8f4H eUoQ40NSWwkQdQ2NKcGu9nRZ9NYxgIP4RrW/rTokJOUBEF9Fg0TTa6gibuEAT0G/nr g9TeyWdcGytYY2YHqq+Nyw4FsNbHOgDYeREmZwqxZLo5AlMG9iWA0lq/GJMoVb/pZV J4FXHiWQb7ZB+85l8KeOPfwmDp3jSGfL82aO1fQFf6zaPzYzsmoEQ6BbWW6zu8nmrr gO8mbZHvVLfxn6L4ARIABeOMFzDubkSXCMZFe7yuKEDJ44IZvnFaF/6u+g28B5WSBZ 5dnNCUCelRFMSjw7lSge22E0F96ny6sTAr8IF6BCWCRfJETDSs8/5z9KHlWg/Pefpx BQ6SJe5wDg457/ANNrGqEF2YQxfUeZVbeZPxrElk1qHejD5O5DxfG3E5vWXc4EDuPO LsaWfodMVMLMUqrp8wuIaT3c= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D112D2BE51 for ; Tue, 4 Feb 2020 19:54:20 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 4 Feb 2020 19:54:20 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 6ED2718A3E239E; Tue, 4 Feb 2020 19:54:13 +0000 (UTC) Received: from didactylos.attlocal.net (unknown [IPv6:2600:1700:57f0:ca20:763a:c795:fcf6:91ea]) (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) (Authenticated sender: eschwartz) by orion.archlinux.org (Postfix) with ESMTPSA id D33C618A3E239D; Tue, 4 Feb 2020 19:54:12 +0000 (UTC) To: arch-projects@archlinux.org Date: Tue, 4 Feb 2020 14:53:55 -0500 Message-Id: <20200204195355.384821-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.25.0 MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH] fix up host_mirrors cachedir handling X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.29 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" This was incorrectly implemented in commit 00671765296ad598f392df7a542dbfca48a6e7b7, which added the host_mirrors root directory as a cachedir, when we actually want to use the pool/* subdirectories (the same ones installed on the build server's /etc/pacman.conf). Signed-off-by: Eli Schwartz --- arch-nspawn.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 198d227..c639270 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -69,7 +69,9 @@ host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)e for host_mirror in "${host_mirrors[@]}"; do if [[ $host_mirror == *file://* ]]; then host_mirror=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g') - in_array "$host_mirror" "${cache_dirs[@]}" || cache_dirs+=("$host_mirror") + for m in "$host_mirror"/pool/*; do + in_array "$m" "${cache_dirs[@]}" || cache_dirs+=("$m") + done fi done