From nobody Wed Apr 24 19:40:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) client-ip=205.139.110.120; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578557939; cv=none; d=zohomail.com; s=zohoarc; b=cUb66NDLesm+Z2iqr8NKV+u8JeNTevso65Gs8nKEsiARP/elk4s+6VyIElOtiw+ZT65CmYub/SxLZgW1WNJC5/9KUgQzcubl2Hr0OTJJbzcfojIfcRlc6eDYQS/aiifC0HNzt+t99lgKfm6N+2q/ZboXpJ1Aj5HaGrXI5lvmCzk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578557939; h=Content-Type:Content-Transfer-Encoding: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=/nerTUCtlHzrU7AmJ8BgFfT139waplGtqrp60y04STw=; b=ag862iT2SYnBlOCTBcTf5yU/pGBYPLl5ne9JqzJMkOdN3wGTEznriaT+p8XZIiRt99ugPQsmwEajQp/htb1gB8A/DqRd3BI0mMHdHHOWeOtF55NI9UQbPJhl+yFP12FaD4PfJjDMUAHF93Ld16aEioUFDFJDIZVvbFKhjoQIhU8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.120 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by mx.zohomail.com with SMTPS id 1578557939469433.62639555209284; Thu, 9 Jan 2020 00:18:59 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-400-BIv4fFhRPUywufaA4xMQDg-1; Thu, 09 Jan 2020 03:18:56 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7481A1005514; Thu, 9 Jan 2020 08:18:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4AEF79CA3; Thu, 9 Jan 2020 08:18:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 034001804744; Thu, 9 Jan 2020 08:18:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0098Iios014869 for ; Thu, 9 Jan 2020 03:18:44 -0500 Received: by smtp.corp.redhat.com (Postfix) id 347551001925; Thu, 9 Jan 2020 08:18:44 +0000 (UTC) Received: from antique-work.redhat.com (unknown [10.43.2.149]) by smtp.corp.redhat.com (Postfix) with ESMTP id B12E91000322 for ; Thu, 9 Jan 2020 08:18:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578557938; h=from:from:sender:sender: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: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=/nerTUCtlHzrU7AmJ8BgFfT139waplGtqrp60y04STw=; b=XTRhnkfqYJz7pRRuPzufX1o8O8h15Hh826hvzSd1NKZiaHTUPOUHzkMjYHHeKoIzpwefpO MvT2Lq4mzBqI6Slu5qATzshwesIVbQQYLFq2ueWNwkh5pg0CjI2Y5Nrr8Yvr/GUhbxnJCb UPIvLMW+Kily18yBR9GoQSbf8W8FdeI= From: Pavel Hrdina To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 09:16:45 +0100 Message-Id: <379111524bdea12e7452b323daf0833af9797e53.1578556319.git.phrdina@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 15/16] autogen.sh: remove --dry-run option X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: BIv4fFhRPUywufaA4xMQDg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Pavel Hrdina --- autogen.sh | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/autogen.sh b/autogen.sh index 49ca91bf64..78c4320af5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,20 +18,10 @@ test -f src/libvirt.c || { die "$0 must live in the top-level libvirt directory" } =20 -dry_run=3D no_git=3D gnulib_srcdir=3D while test "$#" -gt 0; do case "$1" in - --dry-run) - # This variable will serve both as an indicator of the fact that - # a dry run has been requested, and to store the result of the - # dry run. It will be ultimately used as return code for the - # script: 0 means no action is necessary, 2 means that autogen.sh - # needs to be executed, and 1 is reserved for failures - dry_run=3D0 - shift - ;; --no-git) no_git=3D" $1" shift @@ -89,12 +79,10 @@ if test -d .git || test -f .git; then done fi if test "$CLEAN_SUBMODULE" && test -z "$no_git"; then - if test -z "$dry_run"; then - echo "Cleaning up submodules..." - git submodule foreach 'git clean -dfqx && git reset --hard' ||= { - die "Cleaning up submodules failed" - } - fi + echo "Cleaning up submodules..." + git submodule foreach 'git clean -dfqx && git reset --hard' || { + die "Cleaning up submodules failed" + } fi =20 # Update all submodules. If any of the submodules has not been @@ -116,25 +104,19 @@ if test -d .git || test -f .git; then # that can only be generated through bootstrap are present: # we just need to run autoreconf. Unless we're performing a # dry run, of course... - if test -z "$dry_run"; then - echo "Running autoreconf..." - autoreconf -v || { - die "autoreconf failed" - } - fi + echo "Running autoreconf..." + autoreconf -v || { + die "autoreconf failed" + } else # Whenever the gnulib submodule or any of the related bits # has been changed in some way (see gnulib_hash) we need to # run bootstrap again. If we're performing a dry run, we # change the return code instead to signal our caller - if test "$dry_run"; then - dry_run=3D2 - else - echo "Running bootstrap..." - ./bootstrap$no_git || { - die "bootstrap failed" - } - gnulib_hash >"$state_file" - fi + echo "Running bootstrap..." + ./bootstrap$no_git || { + die "bootstrap failed" + } + gnulib_hash >"$state_file" fi fi --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list