From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8ECF51382C5 for ; Sat, 16 May 2020 06:53:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B97A0E098F; Sat, 16 May 2020 06:53:36 +0000 (UTC) Received: from mail-vs1-f65.google.com (mail-vs1-f65.google.com [209.85.217.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B1232E098F for ; Sat, 16 May 2020 06:53:36 +0000 (UTC) Received: by mail-vs1-f65.google.com with SMTP id o26so2597123vsr.10 for ; Fri, 15 May 2020 23:53:36 -0700 (PDT) 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=mDSyfxW+EfPHhtIPkXW1Z+Hf7xxKDzXbdbbRKN5YxpQ=; b=d1hiPuagduukl/2DBuTcgzcXCk6mlOjkreKsMd0IFSyECdpK8RlPX+esDyc4+8HTxa Ks7reiirhBuh9KneP639u7ylbDngLwKfaPatEIoT2GQywcTgpG1Jp2VUwTMF2txXWWPm nVIaTTgSU60UwdHxtsBI8l5P0/qFz+gaqadsXOF5l6/DR4DMIZ0z8VO+Qs1AX7hqGDHb dzPZM0bdusYESk9K+SlSUcmyACpVcGFvW5/4CqDTs9ypsjlemNhHOje2KHvv15N5A0VJ ryuZaFchJcMLBEZgspzJONz40tbUpdUmttvb0ewuyRH/GmVk43PF2B+eW8Y6EVUMBG5b FM7g== X-Gm-Message-State: AOAM530iEiyJmytnGffCjWJzcR7MRR2Lllv/Du2e7hEOiv7RWAfZTAz1 9rPjT4BUae8b+CGoM8rDiOz//jVr X-Google-Smtp-Source: ABdhPJz5knFk8ZPWWcTeP/7w1p+i1DP7ZqNbU6nf9vMgy/z2zfdhiQE/L3ErRHs2EPvF591BHoskPA== X-Received: by 2002:a17:902:7c05:: with SMTP id x5mr7141817pll.278.1589612015030; Fri, 15 May 2020 23:53:35 -0700 (PDT) Received: from localhost ([108.161.26.224]) by smtp.gmail.com with ESMTPSA id v9sm3008057pju.3.2020.05.15.23.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 May 2020 23:53:34 -0700 (PDT) From: Matt Turner To: gentoo-catalyst@lists.gentoo.org Cc: Matt Turner Subject: [gentoo-catalyst] [PATCH 7/9] targets: Decouple distfile fetching from binary packages Date: Fri, 15 May 2020 23:53:15 -0700 Message-Id: <20200516065317.2678080-7-mattst88@gentoo.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200516065317.2678080-1-mattst88@gentoo.org> References: <20200516065317.2678080-1-mattst88@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 2a819da0-87ce-48bf-bf93-d9463fed44c4 X-Archives-Hash: e3e1261ad4e7299dae3ec54a56191dc6 This removes a hack introduced in 2006 to work around a bug in portage where it wouldn't fetch distfiles if a binary package existed for the package. Presumably that's been fixed in the intervening 14 years. See commit 4e00f1338637 (We now only set the options for pkgcache if we are not using fetchonly.) Also remove the useless "i++ // increment i"-style comment. Signed-off-by: Matt Turner --- targets/support/chroot-functions.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index 488041fe..d40279ae 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -152,8 +152,9 @@ setup_emerge_opts() { then emerge_opts+=(--fetchonly) bootstrap_opts+=(-f) - # if we have PKGCACHE, and either update_seed is empty or 'no', make and use binpkgs - elif [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] + fi + + if [ -n "${clst_PKGCACHE}" ] && [ -z "${clst_update_seed}" -o "${clst_update_seed}" = "no" ] then emerge_opts+=(--usepkg --buildpkg --binpkg-respect-use=y --newuse) bootstrap_opts+=(-r) -- 2.26.2