From nobody Wed Oct 12 09:02:20 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 4MnRVj1LvXz4fp4R; Wed, 12 Oct 2022 09:02:21 +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 4MnRVj0tnYz3Zv8; Wed, 12 Oct 2022 09:02:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665565341; 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=M0oAIZ+iDwjR8PsHt91EsymJQYw/NV3JCOqdt1PAHng=; b=nl7UIFDAtsSbwnVJrqVCeiBo9d1i4U/gMmNyIqWbIJvCEZY1oMyCH1cH4r+Bj4aOjfQ653 5IiQ5DyCs1UKsW+JVPc77FGk+SIpzXm3cvQ+4xzmo/2WkuBX+tuXUvQrYQAVvAOjzHybBk DRXcjkbBgO36SATGDHBSchSBj7bT0UEbHvnAZFon13klLz9VFGv9PTiE5S5EGB0jekocSF 7YlcWinDKa+MzWX/gMDNfiQaLfJkv/wdvqnkBAnEPNrnruTfdFMAcugaf/WXneKT4R1oNC 5xZMgV+VSLB2SeeJaklyvIHUoA4C82jXIL29A8dEdp24PUvlCjHte7Gb8QVmVA== 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 4MnRVh73PQz1G2d; Wed, 12 Oct 2022 09:02:20 +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 29C92K9H031612; Wed, 12 Oct 2022 09:02:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29C92Kd1031611; Wed, 12 Oct 2022 09:02:20 GMT (envelope-from git) Date: Wed, 12 Oct 2022 09:02:20 GMT Message-Id: <202210120902.29C92Kd1031611@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: 3cb757615f26 - stable/13 - /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/13 X-Git-Reftype: branch X-Git-Commit: 3cb757615f26c5a486b9dde1ba5c3df478ccfe60 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665565341; 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=M0oAIZ+iDwjR8PsHt91EsymJQYw/NV3JCOqdt1PAHng=; b=nnz/uAWwE1+/QTf1FuVcY8IGIYKQzxgt8cDXAVI66Hut42+iQ8XvWwpttghH2VYvY4bRUv Qex0hhEixIcEoqVACePZ3FPC4koGmmsXiorqqAoToQBOm+V/y/3PUua6g9Y4Iwuuhl21Mj SRzXqqrfIlWE2ZESA9equEYH1Ql8356+AHtun9h9DscmuupGV8KjxyAfwDQjk+Mp8VCM5v KzwvAcTDp0x3p1iuhGml0Wzle82CqLJ+1vhM5/J9DZHxXXFpVSESMAztSrma4EM+Un0wUt wu1Ohxpj/G8xlt06vZ5UbTwzz+xzTbkiMjulb1hG2DzPteBgOa7VSmEfgkyXJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665565341; a=rsa-sha256; cv=none; b=NlErBvegyJLGfw7DqV5ogc8GAKNzT5yVEvqMIAEeoIJFoIGPzRbq1v3itA8IyqoiSnp25/ aduWsWeeRFPa2SfWwbiscbSXV5nvJl/1jT2alPoaxHSyVOQBrdpY8AQhfep1ju6somZwsc nBE6T7/gO9bw+0A5EUY8ypUUherJz3+y2mZ4EB2xBa4cv+LvcumngnTGxADidG2LGLrFVH HQ5MBe3hVJPSu/iM9HkMn9RYCa3MaahIrCkkiun7ztXCQSdUOXps7C4yy3hP5MkARPtyp5 cPIOKbMaB+qdeXoDVG8DLbrAqJhOmQ5CQkSNpzd1qKMUrSBiWozjoX7nFdykyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3cb757615f26c5a486b9dde1ba5c3df478ccfe60 commit 3cb757615f26c5a486b9dde1ba5c3df478ccfe60 Author: John Hood AuthorDate: 2022-04-21 21:39:14 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-12 09:01:56 +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 7c5e6ebc6e9c..f3c338c6961e 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;