From cee1dac95fa359be6a7c07302819332a8e9aa4ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 30 Oct 2010 11:44:54 +0200
Subject: [PATCH] In CVS, don't call vcs_status if update is used already.

As CVS lists changes during the 'update' call, there's no reason to call
it twice. Thus, call vcs_status only if -d is used.
---
 sunrise-commit | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sunrise-commit b/sunrise-commit
index 2d2d6fa..187aac2 100755
--- a/sunrise-commit
+++ b/sunrise-commit
@@ -441,7 +441,14 @@ main() {
 				fi
 			fi
 
-			vcs_status
+			if [ -z "${noupdate}" ]; then
+				sayv "Updating the repository..."
+				vcs_update
+			fi
+
+			if [ ${SC_VCS} != cvs -o -n "${noupdate}" ]; then
+				vcs_status
+			fi
 			echo
 
 			# Since commit 32264c3, repoman supports '--ask' option,
@@ -475,11 +482,6 @@ main() {
 				confirm
 			fi
 
-			if [ -z "${noupdate}" ]; then
-				sayv "Updating the repository..."
-				vcs_update
-			fi
-
 			# In CVS, we don't prepend the package name to the commit message.
 			[ ${SC_VCS} = cvs ] && noprepend=