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 2A034138350 for ; Sun, 2 Feb 2020 02:26:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C736E0831; Sun, 2 Feb 2020 02:26:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 41E1AE0831 for ; Sun, 2 Feb 2020 02:26:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DD16534E421 for ; Sun, 2 Feb 2020 02:26:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A981D7 for ; Sun, 2 Feb 2020 02:26:38 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1580610370.44ed4c96cf48aa4268eb4eb5c71f382275303419.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/kmerge.sh X-VCS-Directories: targets/support/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 44ed4c96cf48aa4268eb4eb5c71f382275303419 X-VCS-Branch: master Date: Sun, 2 Feb 2020 02:26:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fd6934c7-fe4e-47cf-8aec-285807278526 X-Archives-Hash: 2e6940c387e1a1755c73b0e913a74a60 commit: 44ed4c96cf48aa4268eb4eb5c71f382275303419 Author: Matt Turner gentoo org> AuthorDate: Sun Feb 2 02:25:03 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Sun Feb 2 02:26:10 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=44ed4c96 kmerge.sh: Ignore missing package.provided Signed-off-by: Matt Turner gentoo.org> targets/support/kmerge.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/kmerge.sh b/targets/support/kmerge.sh index c43db8d1..754a129f 100755 --- a/targets/support/kmerge.sh +++ b/targets/support/kmerge.sh @@ -231,7 +231,7 @@ then echo "No pending updates for ${clst_ksource}" else echo "Pending updates for ${clst_ksource}, removing package.provided" - rm ${clst_port_conf}/profile/package.provided + rm -f ${clst_port_conf}/profile/package.provided fi [ -L /usr/src/linux ] && rm -f /usr/src/linux