From nobody Sat Sep 14 07:21:46 2024 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 4X5N0C0J6yz5W3DW; Sat, 14 Sep 2024 07:21:47 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X5N0B6nJ3z4d5W; Sat, 14 Sep 2024 07:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726298507; 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=VfaNtuopUKkcGq72X5GI7tLk2XGMq8MZ8jT3OdbSa+E=; b=Eiod0dpQ5yI4LDNN2CYQY17QeDBEJ9nl4rbIkJwKzmIIkF2Q+q788Vz7Nj1bAbd/ma1vtJ Kd3Ee5fEsifCK/mUoMqOubZRC0ST1B6sv6SJaVfjhwpDLH3n8vB+PAn7thZL8MjrSx5/rm A7u+rRzQroqcDNiUXwXSy2eOGYGqiv+3oTq1oaaexojexqhK+WDiDgMdEgelrplrJB7iJJ 4KXtbz3JWwDM6Es/pI2ptK1Xaab4YQYp6BDX19589ZeW3ExeoFv2+yDRPEEN3b+7My1r8k jKL4/4dOmVO2alBlF4d2t6Osfd9f8Y3BP3pDpLdD3CQrJ1o2HZWdoTd5+/zEGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726298507; a=rsa-sha256; cv=none; b=IqQ615mTXqJhf9cErN3sEfVhEHcFKEknAQ7wO66k98bA+8DRZukWXyTi9Z+9ikeu4EpUq2 8PuNYQzNXbqc/paXF+yH/ho+wZYgmyl9SXjUSn//QI1x8hKQpdzMUX9OGQPWIxfW5aTlMX ymxpNDzUNF8xoCTUsJ76zQ203u6SPuWwXIxzo+Q2aw5sGq72KwBRjqt6fcdckEathphBLw 9akPj2p9NrM5pISrfaESWaANmMbgoF+BmlqXxvjuQtyMRt+JKCDCzNaO1CMgeYUYHlhx/o 2seOFZ1xMEze1LW2NEdwdNayIUTupC8qAZWit7kxEHullKu56b4AKivTuWLdXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726298507; 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=VfaNtuopUKkcGq72X5GI7tLk2XGMq8MZ8jT3OdbSa+E=; b=iAhX6Sy9z/pbHFK+ZbunVWuIk6Y/Z29TqF7nNpWan/i7ip0ZeMdMpj7CAzpdVzntV2uVT7 HCvRPaKTfazEQrYFVVtt/VVpyQ8/PLS2/KFKn3XDhws2VQeqw/QaN6VLwa4zi25Lz27uST onxzICsBG+7sEwi+DamMK1OodlW+ACDuU0gDuOn03CMMWhUJ5Gb/0rxJxVgZ6Hj3Qpf9GM TIKF6THGhE0KjyQQ+6J/DFwTQUokTdt4sESI/NSJ4ZGWJV07DtjMSlLaSZnZuDRqgXem+P fNcx8vIYlUFBgoRVnpzOLXCiarlWrvedGMyvy8TYwNA/IvIdWwJQaTNjwgpnLg== 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 4X5N0B6NYvzHwb; Sat, 14 Sep 2024 07:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48E7LkRJ012392; Sat, 14 Sep 2024 07:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48E7Lk9C012389; Sat, 14 Sep 2024 07:21:46 GMT (envelope-from git) Date: Sat, 14 Sep 2024 07:21:46 GMT Message-Id: <202409140721.48E7Lk9C012389@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 048132192698 - stable/14 - MFC: fetch(1): suppress "Not Modified" in quiet mode 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 048132192698865914e07c899898861b2b24d676 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=048132192698865914e07c899898861b2b24d676 commit 048132192698865914e07c899898861b2b24d676 Author: Eugene Grosbein AuthorDate: 2024-09-07 02:14:23 +0000 Commit: Eugene Grosbein CommitDate: 2024-09-14 07:21:07 +0000 MFC: fetch(1): suppress "Not Modified" in quiet mode "fetch -qi" should skip printing "Not Modified" for successful http(s) request. Still print it by default (v_level == 1). (cherry picked from commit 7a6309fdc79427b0a7a5c3876daba150d946ae22) --- usr.bin/fetch/fetch.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 8be5742386e7..bb7d27d896b6 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -583,16 +583,17 @@ again: if (sigalrm || sigint) goto signal; if (f == NULL) { - warnx("%s: %s", URL, fetchLastErrString); - if (i_flag && (strcmp(url->scheme, SCHEME_HTTP) == 0 || - strcmp(url->scheme, SCHEME_HTTPS) == 0) && - fetchLastErrCode == FETCH_OK && + if (i_flag && *is_http && fetchLastErrCode == FETCH_OK && strcmp(fetchLastErrString, "Not Modified") == 0) { /* HTTP Not Modified Response, return OK. */ + if (v_level > 0) + warnx("%s: %s", URL, fetchLastErrString); r = 0; goto done; - } else + } else { + warnx("%s: %s", URL, fetchLastErrString); goto failure; + } } if (sigint) goto signal;