From nobody Thu Jul 28 15:55:35 2022 X-Original-To: dev-commits-src-main@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 4LtwGb3SZrz4X7FV; Thu, 28 Jul 2022 15:55:35 +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 4LtwGb2wzNz3F2t; Thu, 28 Jul 2022 15:55:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659023735; 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=qUzIIxd8lt/D4IGGWCc62NXUMmIAb7KVvxfLCiamX18=; b=wuZoS1sLG9kGqShmTq9kOUdfMW4CHmMLcv81QVc6YJJgptFkytnjuvVvE2/0oNoALD3VkV mArdfJwfqVV/mgvpssL4QfTH9uFzEcqI3ye0FS7hfzPH30Hz5LJpFtAifCXmkODgmcB+vz 4bQuDY15vBI1oazwyPZgFszn4Dy1qnGggnPXWj5f49ojs+ew2brVoiS8/9eQ7eC/+Onrsw 7cNkU7n5zEeYsd86sRwpW5II2xhJej5E4hFRju3H5hWqiYeWt3yeuFJnhjAQenRz7djALI vzY965HWyNP+KwziLul5Ncn1lDWf0d1yIxKR9qRebave34xN1rtNs6xNQ3pX0g== 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 4LtwGb1zsqz11kS; Thu, 28 Jul 2022 15:55:35 +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 26SFtZV6037474; Thu, 28 Jul 2022 15:55:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26SFtZLA037473; Thu, 28 Jul 2022 15:55:35 GMT (envelope-from git) Date: Thu, 28 Jul 2022 15:55:35 GMT Message-Id: <202207281555.26SFtZLA037473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 60b92ba9323c - main - /usr/sbin/pkg: don't sleep on fetch failure List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 60b92ba9323c2dd249ba3a3349b207c2d0b9d212 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659023735; 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=qUzIIxd8lt/D4IGGWCc62NXUMmIAb7KVvxfLCiamX18=; b=PabSgEgop6oSCI45CXchFz+GIJknMjz4eIKGgXA4bMQOmsG9p8RUcAR2iFEfvKGGg9TPUT M2YU674tyc2oIGOSg6w8K2UV4mXHgN+lR5d1Kk/Pt6GursESZ2Egf31kCXqzdc50UF3Sqc yFaAQkrzKRs+coFh7EAvfdM582YrhpF57rhxGlaW0DrKQruYo26pmeMm3rHH/Mct9sUHzD 8D23rD04R0+5vLbArm26h0JTGCsc+zTjjXvADcKvW+UFl8iDAyRUHnP8iaGrscEjYW2SZK X1JAdk/pmcj/q5iBUPKSx1ACHgQHRrP6UcO8fW4+6whEPzeHtcULmdKq6F+ZkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659023735; a=rsa-sha256; cv=none; b=YYi1vuq9hK1u+CVadXXti1sszN9AYbWzbh9W72oC7hcwhGWwFleXQk7k53VKQ/RliI533W H18OYhBCz5nf6bGwWT0+udif96cgjuJ5yhtp4EXJCLW2aW+r/nNGdDS/ZosYIeZtHE5dTe ZJPlpTy/h4iwNMaiLAoR6Zc2mOuZIaREYM68lpto6s35KDfWEMgnpeqjqw2SDJgxFLKYIw 7y77D5gAKPtEVdd0CUVIr3P9sC2LyzExU6lKJHUgwZAxMrgWkoZCpob+l65iC6RRYaoqhO a3HBYHRk/xS+g9Kt/IIdb2Tl+KZYi6D1A93M2zgAsNx5XMD1rZyHfImvRUOZeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=60b92ba9323c2dd249ba3a3349b207c2d0b9d212 commit 60b92ba9323c2dd249ba3a3349b207c2d0b9d212 Author: John Hood AuthorDate: 2022-04-21 21:39:14 +0000 Commit: Baptiste Daroussin CommitDate: 2022-07-28 15:55:13 +0000 /usr/sbin/pkg: don't sleep on fetch failure PR: 263458 --- 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 292f4a68b824..fdc519be8492 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;