From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Subject: [PATCH] Cleanup scmversion script,
	fix --save-scmversion option
Date: Mon, 13 May 2013 20:23:54 +0200
Message-ID: <1368469434-16467-1-git-send-email-marmarek@invisiblethingslab.com>
References: <51912F7E.20508@invisiblethingslab.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <51912F7E.20508@invisiblethingslab.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Olaf Hering <olaf@aepfle.de>
Cc: Sander Eikelenboom <linux@eikelenboom.it>, Marek Marczykowski <marmarek@invisiblethingslab.com>, Keir Fraser <keir@xen.org>, Ian Campbell <ian.campbell@citrix.com>, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

Remove unused variable, fix erroneously removed --save-scmversion code.

Signed-off-by: Marek Marczykowski <marmarek@invisiblethingslab.com>
---
 xen/tools/scmversion | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/xen/tools/scmversion b/xen/tools/scmversion
index 219d898..b0c3b95 100755
--- a/xen/tools/scmversion
+++ b/xen/tools/scmversion
@@ -16,10 +16,10 @@ usage() {
 	exit 1
 }
 
-scm_only=false
+save_scm=false
 srctree=.
 if test "$1" = "--save-scmversion"; then
-	scm_only=true
+	save_scm=true
 	shift
 fi
 if test $# -gt 0; then
@@ -32,17 +32,10 @@ fi
 
 scm_version()
 {
-	local short
-	short=false
-
-	cd "$srctree"
 	if test -e .scmversion; then
 		cat .scmversion
 		return
 	fi
-	if test "$1" = "--short"; then
-		short=true
-	fi
 
 	# Check for git and a git repo.
 	if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
@@ -98,4 +91,8 @@ cd $srctree
 # full scm version string
 res="$(scm_version)"
 
+if [ "$save_scm" = "true" ]; then
+    echo $res > .scmversion
+fi
+
 echo "$res"
-- 
1.8.1.4