From owner-freebsd-bugs  Wed Sep 12 17:20:12 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id B752037B407
	for <freebsd-bugs@hub.freebsd.org>; Wed, 12 Sep 2001 17:20:00 -0700 (PDT)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.4/8.11.4) id f8D0K0A22739;
	Wed, 12 Sep 2001 17:20:00 -0700 (PDT)
	(envelope-from gnats)
Received: from hand.dotat.at (host217-35-41-52.in-addr.btopenworld.com [217.35.41.52])
	by hub.freebsd.org (Postfix) with ESMTP id F009E37B406
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 12 Sep 2001 17:12:30 -0700 (PDT)
Received: from fanf by hand.dotat.at with local (Exim 3.33 #16)
	id 15hL38-0001h5-00
	for FreeBSD-gnats-submit@freebsd.org; Thu, 13 Sep 2001 01:12:14 +0000
Message-Id: <E15hL38-0001h5-00@hand.dotat.at>
Date: Thu, 13 Sep 2001 01:12:14 +0000
From: Tony Finch <dot@dotat.at>
Reply-To: Tony Finch <dot@dotat.at>
To: FreeBSD-gnats-submit@freebsd.org
X-Send-Pr-Version: 3.113
Subject: bin/30544: [PATCH] remove irritating pauses from mergemaster
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-bugs.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-bugs>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-bugs>
X-Loop: FreeBSD.org


>Number:         30544
>Category:       bin
>Synopsis:       [PATCH] remove irritating pauses from mergemaster
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 12 17:20:00 PDT 2001
>Closed-Date:
>Last-Modified:
>Originator:     Tony Finch
>Release:        FreeBSD 4.4-RC i386
>Organization:
dotat labs
>Environment:
System: FreeBSD hand.dotat.at 4.4-RC FreeBSD 4.4-RC #4: Sat Sep 1 19:06:27 GMT 2001 fanf@hand.dotat.at:/FreeBSD/obj/FreeBSD/releng4/sys/SHARP i386
>Description:
>How-To-Repeat:
>Fix:

Index: usr.sbin/mergemaster//mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.6.2.9
diff -u -r1.6.2.9 mergemaster.sh
--- usr.sbin/mergemaster//mergemaster.sh	2001/08/11 20:27:52	1.6.2.9
+++ usr.sbin/mergemaster//mergemaster.sh	2001/09/13 01:08:52
@@ -200,12 +200,6 @@
   done
   unset NO_INSTALLED
   echo ''
-  case "${VERBOSE}" in
-  '') ;;
-  *)
-    sleep 3
-    ;;
-  esac
 }
 
 # Set the default path for the temporary root environment
@@ -338,7 +332,6 @@
 if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then
   echo " *** You have ${PAGER} defined as your pager so we will use that"
   echo ''
-  sleep 3
 fi
 
 # Assign the diff flag once so we will not have to keep testing it
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message