From nobody Fri Jun 17 09:11:11 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6E1A0859289; Fri, 17 Jun 2022 09:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LPYDv2kdWz4ZFR; Fri, 17 Jun 2022 09:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655457071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghKvW/ySrzyO5N5Rr+raoJGUnWL0WdMufoOAM7xbRJw=; b=VWJsvSb1ar8S3biXtAkGMMk0QZ7HeOtYZUxzJb1sWXYU2Tcz+SU5quTSK9xSHR0WYc2dV/ Tn+RwKq2Ma6JUxGojlcTFGXz2+LLae4gesHrMNz1nr+7E2heOB/GgolIakIETJkIX+Xsa2 WPRlyqoO8sHI+fi8NSlyBOueQiXudwH4laWrWNjj7wlouQ26yo69w7fdFOjp/YrHNNhI+b nKDMBXD3h3cTbgGDt5OXJ/5TeAg8h6wIq2gh2opbCh7xUOBMWkgk/4RmI7EYfKEqw9qG7D cDZkRwPMlwQ9ye6DD9pVJl3kguNcrv5h+Ue3i33mWfPb69YWShfeRfV+buv3YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3DDDC1CE5F; Fri, 17 Jun 2022 09:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25H9BBul069908; Fri, 17 Jun 2022 09:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25H9BBhl069907; Fri, 17 Jun 2022 09:11:11 GMT (envelope-from git) Date: Fri, 17 Jun 2022 09:11:11 GMT Message-Id: <202206170911.25H9BBhl069907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 5575d5a5486d - main - dhclient: fix pcp:pcp cleanup failure List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5575d5a5486d6065099fb4c25d27fec01df3dc35 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655457071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ghKvW/ySrzyO5N5Rr+raoJGUnWL0WdMufoOAM7xbRJw=; b=SaOxehNIcFIudzi288dqqnyYHWoKbXXadQjwAKaVuydQw1/Gre7mImlh/GRKJF1z2nUKjp GSpGOO4+I+Ii2aoFK4biXeQxLnYGY5nS7V25QRDWvI602FFv1Zdp48HQFPLxHlperafBK9 DTJVS0j4RwRJDtk/DN0hn0FnOCxCdIcvckDsfcH/fvzZI67E7eIUoRfh4plrLOu3lHC+SW cQ/Z6TgGJfjnCJBQkYF1+vgSc4vvVLqYWYpZuuAzcMbPCPPW512IoNyqJy3vmOI9aSeTPb 71wLaRbQMJRhfQ/s/KoSw5pG0pttnQ2tkIF0OPgg2h4wCqaNhImwfUO5N/WoCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655457071; a=rsa-sha256; cv=none; b=CHwFxl8AykGDVag/YfuQ/EXBuSkVxIWgpgiBYYPzsDmZFJKgwHQdeRfxDETncIQ1w61Ho6 mo+wFE7McJ3WSARUTceubCrM4UK9Z2IfFMyxGp2v8QsV3sqBKYWm3GtjHk4MkINdGyIhAV HGPosTovuC1NL55ENO4iNjktrNrSTfTMKGHgpe7doUPKCjnkgM6a1TPZmrDV6gLuXGytKB VKDfh/RAFOZ3nz3UClo7+cjYh0kx6FEwDcUYh6w6y5VfqL8TqzkfsWTGFcqOBOurKCOn9F 887CVWcnvqb8ErNVF3mzmkl0fK1lwo3dW8qzBLYkM6Yrvwv494QLGYkm9aXagg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=5575d5a5486d6065099fb4c25d27fec01df3dc35 commit 5575d5a5486d6065099fb4c25d27fec01df3dc35 Author: Kristof Provost AuthorDate: 2022-06-17 07:01:05 +0000 Commit: Kristof Provost CommitDate: 2022-06-17 07:10:52 +0000 dhclient: fix pcp:pcp cleanup failure If isc-dhcp44-server is not installed (as is the case the project's CI servers) we don't create ngctl.shutdown, causing the 'rm' to fail. That in turn causes the cleanup function to return non-zero, which causes kyua to consider the test failed. Use 'rm -f' instead, so we don't error even if the file doesn't exist. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/dhclient/tests/pcp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dhclient/tests/pcp.sh b/sbin/dhclient/tests/pcp.sh index 88c39f452f7f..4875a10a10ce 100644 --- a/sbin/dhclient/tests/pcp.sh +++ b/sbin/dhclient/tests/pcp.sh @@ -185,7 +185,7 @@ pcp_cleanup() for i in $(cat ngctl.shutdown); do ngctl shutdown ${i}: done - rm ngctl.shutdown + rm -f ngctl.shutdown } atf_init_test_cases()