From nobody Wed Oct 12 09:02:31 2022 X-Original-To: dev-commits-src-branches@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 4MnRVv3fqTz4fnpJ; Wed, 12 Oct 2022 09:02:31 +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 4MnRVv37j2z3bFg; Wed, 12 Oct 2022 09:02:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665565351; 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=xxeYPRttIV00LS6XQRsLR7l0MxzZ0JF6aG/uzMzULjo=; b=POF/O+/Dgy+++zTwmMGuSZEgcCNviZw43nuuIYTgy0dgujB0+npzGPcCFcUbgVAa8JK0vK D9n1D2shxhTgc79Ixz68VFdLAJSuctTySElYcsm5fQ5Tg9uVgYoBgalCfpOrD/2SmJBH7l Y/KJK8o9mew/WiJzpFE+nZNo2kYsm77MSmc36yl8e8MXw0MpJiTPav94VSpgqd9wZ2KuIJ UAl3jmwSudtGpIwxxdPKhtF51ptctzjZ79My+/VdXOubgAP2f7xLjvSNe5ubo2zVPbBBW0 FI9h5vD+HIGRwfwb5j9pVgKxmbAN3uB7h9GSWedY8GwPxon9fD72YILFCBDnAg== 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 4MnRVv2CK7z1G9g; Wed, 12 Oct 2022 09:02:31 +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 29C92VLu031745; Wed, 12 Oct 2022 09:02:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29C92VI1031744; Wed, 12 Oct 2022 09:02:31 GMT (envelope-from git) Date: Wed, 12 Oct 2022 09:02:31 GMT Message-Id: <202210120902.29C92VI1031744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: fdf6f6babe61 - stable/12 - /usr/sbin/pkg: don't sleep on fetch failure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: fdf6f6babe6169261dd396c9bf966ab8a82a7c64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665565351; 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=xxeYPRttIV00LS6XQRsLR7l0MxzZ0JF6aG/uzMzULjo=; b=aMHMoRoRG10vH4A19iG1Ddy4YRAKQABRWw0NqX/o222z8CRiHyM9GDMthNI4FyZAU8ZBEK l5TRgj8xI271gHNlxNxsIsUvaC/l5Tb8pBIka5/uNm8V77fuhsOZnckXzfeIZ+jlOry5J5 j2Ao9R7FIvUraKxiSd6hMHOEnzVj2vvr3OX7qGmI3fM3kqLK0Tp0nhx3J5qqF5AEk4FFex iaqFBwDAaSMhkBf+cO62wJ62WMQQjy/XSVdb2Yje4dygwyXVkBmWCI9aTfwUqNrOeL5VQT vQ1IAWbN/OVArb5hlkI68IiEUckPCa2kYYRMVIDw46kvAGFNWYRZ9QQpBkl/XQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665565351; a=rsa-sha256; cv=none; b=AG9x4ja4LU6SK+Qmlazv4l6QvbQE/LUmCXSHYs8yKRBFTPLe4ScsgvSu4ENNtcc88FAND2 SE9k8Balyeem9ULgo2mRycYyhGRclK3idX/xr1bFDk/2yN8tKLSiSdtZ0sFSeEN5oLh7uf GDYFwgtEUHIbLSlRLN9LE0WLLu99sqeKGUoNumAhpWa2pmr4Bwz/iP9uEmxKW0FPsEIgdN +UvWRO0a2Y7MkTnJd8zTaOzHT1PcIlbhjTokUZbIvvwaBj5JnOBXtI2Ynmgo0VEDbQE6vb cYTYdQKucCK026dhr+ba2WXlqRFfXzrAeTRAy4j5YPxe15HRAamoA3py0r7/ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=fdf6f6babe6169261dd396c9bf966ab8a82a7c64 commit fdf6f6babe6169261dd396c9bf966ab8a82a7c64 Author: John Hood AuthorDate: 2022-04-21 21:39:14 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-12 09:01:44 +0000 /usr/sbin/pkg: don't sleep on fetch failure PR: 263458 (cherry picked from commit 60b92ba9323c2dd249ba3a3349b207c2d0b9d212) --- usr.sbin/pkg/pkg.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/usr.sbin/pkg/pkg.c b/usr.sbin/pkg/pkg.c index f759a3c31d1f..e5e4c656a51f 100644 --- a/usr.sbin/pkg/pkg.c +++ b/usr.sbin/pkg/pkg.c @@ -236,9 +236,7 @@ fetch_to_fd(const char *url, char *path, const char *fetchOpts) --retry; if (retry <= 0) goto fetchfail; - if (mirrors == NULL) { - sleep(1); - } else { + if (mirrors != NULL) { current = current->next; if (current == NULL) current = mirrors;