From patchwork Sat Jul 4 02:51:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 1322710 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=ivCOUbiC; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=riuwMM49; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49zGgS1cVmz9sQt for ; Sat, 4 Jul 2020 12:56:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=EJ96Ym8Hyxd002rGp5pfbamLnC3XcIe2Pt2xg1kwHGY=; b=ivCOUbiCQsKUO6HFT7KdfLvG4l iEkTQC/OmBr+C2lcG2sQUOZXvbu0MbdEPIn1E9WjYjAx5gOK3vGDABPPyPwRHPRbmheSYLMP5jPgT gfyBzgIG60qzTIyvhtLzipv0I+LH35C671KKl7FDklZbEX1d6cBhSS85sMMcJbcWrkPaD+6WHPIWM QLFm6XgnbNfHYxqILlDJLMhc5Rk43irKO56MxTmef+V+UHeVFCiB8epcT5gR8+l488TXE7uSDTALE PTGn7GgHymCgzr35COFtVpaXqTUC4sh9AU7sxxGl+69jZt5bZd2B1E+9MUGsZpuQHiRALyHLCs+mi Dr0eZa4A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrYI4-0005Nh-1Y; Sat, 04 Jul 2020 02:52:32 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jrYI0-0005NP-7B for openwrt-devel@lists.openwrt.org; Sat, 04 Jul 2020 02:52:28 +0000 Received: by mail-pg1-x543.google.com with SMTP id l63so15838520pge.12 for ; Fri, 03 Jul 2020 19:52:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=VVEz6ac9jBIJ6mDsjR8xxSTDgrF3LWPcF6EiXdBSSRY=; b=riuwMM49zcVsXYYxarLu06+lVN768Vc9w5NHLuS0Dc97qA9zEy73QogzVOsaqY58O6 s1tEL6cquMDW4xOmMs70UVSZofnKB5hqdGygnYkWlON80wALUb1NMy0crzIbbYpztUC3 0LuQ+4G/XBLc3qVN0LlGZYHV0MGwBw96yU/fR4ct7AGqBlKnQhpIn0df+dkVxFG2/ezo p1yh7g31EYFqgwnT+K8SOdqEl3rPiNG2X4tubOfiF7cbOSsW0FhYqj6dSOSBmkOE+5DV vpfvwW4A2HOQd8Yw/PeyMKBB3MG+APdkqn6oVPXBjrFe/UDXXqSEiezg4HdXi4+38iWt Ygdg== 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; bh=VVEz6ac9jBIJ6mDsjR8xxSTDgrF3LWPcF6EiXdBSSRY=; b=XCBdksp6oL23LUzsbjILkJCrdlY8KZZZNFt+UixZlLojqZJUqQbmACt3dpnonpsa37 svRLzkJyTlO9+FCKu1dyF6w1pJiUTo4YDI9w/S+xs/qNa6R3RvJBpwRNh6oUWfoJ05mR rLNsK8OlSRXW9JGogJ/HUy+NOZZ/O4SlaXoyuXkZeKZsCGVuBXGVn0NmMMHuYzZFntju yQLxkN/6qdk2Tn4UuuCQ/GyxtmwJOOB8R+6Drb6FxHMB3wuBooiJxPv+sMU5NIEejePi YJ+CX5j3m82YmopTmxODtsn5U8g5EUCyhbbi8/Xrj6JPFCFWqffOktpTVQwyoOcvwPsO AV8Q== X-Gm-Message-State: AOAM533pE2j0Dyb/0yPBXhSJTwd3/9eWU6mzZspOrypIl0bPTz/7tuPg +ru0deUl4JgUSPBSWs+PIur8G31n X-Google-Smtp-Source: ABdhPJxa9KNl6N2l3v2C9MOQdGoDUnLvmntO2V7iJV2OZarFGgSPLFPuU5U0EjuzuO84YwnlGesa7A== X-Received: by 2002:a63:e744:: with SMTP id j4mr23064527pgk.416.1593831144126; Fri, 03 Jul 2020 19:52:24 -0700 (PDT) Received: from brian-ubuntu.lan ([2601:647:5800:8d47:15f1:d2b6:764f:b105]) by smtp.gmail.com with ESMTPSA id v28sm13133584pgc.44.2020.07.03.19.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Jul 2020 19:52:23 -0700 (PDT) From: Brian Norris To: openwrt-devel@lists.openwrt.org Subject: [PATCH] scripts/feeds: warn when skipping core package override Date: Fri, 3 Jul 2020 19:51:57 -0700 Message-Id: <20200704025157.19097-1-computersforpeace@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200703_225228_325199_DA046520 X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:543 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [computersforpeace[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Brian Norris MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Otherwise, a n00b like myself can get quite confused when moving a package from core to feeds, for example. (Hint: one *really* needs to clear out the tmp/info/.packageinfo... entries for the stale package, but '-f' works as well.) Signed-off-by: Brian Norris --- scripts/feeds | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/feeds b/scripts/feeds index 69ab60278a1a..dc2b91266dcd 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -536,7 +536,10 @@ sub install_src { # If it's a core package and we don't want to override, just return my $override = 0; if (is_core_src($name)) { - return 0 unless $force; + if (!$force) { + warn "Not overriding core package $name; use -f to force\n"; + return 0; + } $override = 1; }