From nobody Mon Feb 9 17:36:28 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675752536; cv=none; d=zohomail.com; s=zohoarc; b=mOlAiGly7iLoHu2nOtFf4EzfRbSqRpzdsqB7y0oXf3cKO8GvHLVeNw9F0eUxgQ9H7ZMhe7WhpVrmdqooIqRriR8HcoG3GbRumY68heeePOb8Co9q9DH1KDne3yAfEgjtCVpQIye00qlkwVgzD8BS8PPVVJz+uiDoT9J5+LqGLPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675752536; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mio3AGiefmL/jc/ixLRzIIZ2DOgsg5gqJq29mnTQ8ok=; b=cKU18Zn20HSaJUEhOBAwwX3e1HzGgXWN5OpuBQsxAq5GYnqqSZFkusipPjlevYbBcSdcvwAdnpng4817fVwHGB7eEiuRDStoo6Wd3mzhzaSb4Rmbjw1hkkI2S7Etjr0kUNufKSsvMF3X4e45XOstoRt17hYizijfK7btsqFQ6F8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16757525369361004.1984069937174; Mon, 6 Feb 2023 22:48:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPHkf-00085A-K3; Tue, 07 Feb 2023 01:46:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHk1-0007LX-6h for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:46:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPHjz-00044B-Ff for qemu-devel@nongnu.org; Tue, 07 Feb 2023 01:46:08 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-629-NgY-KWpBNqGPht3JI7oKEQ-1; Tue, 07 Feb 2023 01:45:25 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5EE7185A5B1; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 36BD5492B21; Tue, 7 Feb 2023 06:45:25 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E4E3D21E6A21; Tue, 7 Feb 2023 07:45:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675752366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mio3AGiefmL/jc/ixLRzIIZ2DOgsg5gqJq29mnTQ8ok=; b=Kc+NDROeyjCt1yOfoS9sHuvSRqr1NdJ9E8XajcHgLM0SnGisgBsdJyTnziuNo6LzZZTGvk 0OYb5Xzxv2YyM8qTwwRNkSsKB02JgB1OHMPXwM8bSoTM1gUkb6HQPGuOQm+A9HBi5mqwKf fClWXX2+PXDtt/IzM8ag91xJvyANvxw= X-MC-Unique: NgY-KWpBNqGPht3JI7oKEQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, "Michael S . Tsirkin" , Eric Blake Subject: [PULL 02/20] scripts/clean-includes: Don't claim duplicate headers found when not Date: Tue, 7 Feb 2023 07:45:05 +0100 Message-Id: <20230207064523.3968603-3-armbru@redhat.com> In-Reply-To: <20230207064523.3968603-1-armbru@redhat.com> References: <20230207064523.3968603-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1675752538102100003 Content-Type: text/plain; charset="utf-8" When running with --check-dup-head, the script always claims it "Found duplicate header file includes." Fix to do it only when it actually found some. Fixes: d66253e46ae2 ("scripts/clean-includes: added duplicate #include chec= k") Signed-off-by: Markus Armbruster Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-Id: <20230202133830.2152150-3-armbru@redhat.com> --- scripts/clean-includes | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/clean-includes b/scripts/clean-includes index 86944f27fc..8e8420d785 100755 --- a/scripts/clean-includes +++ b/scripts/clean-includes @@ -177,9 +177,8 @@ for f in "$@"; do done =20 if [ "$DUPHEAD" =3D "yes" ] && [ -n "$files" ]; then - egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]' \ - | sort | uniq -c | awk '{if ($1 > 1) print $0}' - if [ $? -eq 0 ]; then + if egrep "^[[:space:]]*#[[:space:]]*include" $files | tr -d '[:blank:]= ' \ + | sort | uniq -c | grep -v '^ *1 '; then echo "Found duplicate header file includes. Please check the above= files manually." exit 1 fi --=20 2.39.0