[PATCH OSSTEST] cri-common: Refactor select_prevxenbranch to cri-getprevxenbranch

[PATCH OSSTEST] cri-common: Refactor select_prevxenbranch to cri-getprevxenbranch

[Ian Campbell]

This moves it outside any prevailing set -x and reduces the amount of
noise in various logs.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 cri-common           | 16 +---------------
 cri-getprevxenbranch | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100755 cri-getprevxenbranch

diff --git a/cri-common b/cri-common
index 94696ab..2669485 100644
--- a/cri-common
+++ b/cri-common
@@ -61,21 +61,7 @@ repo_tree_rev_fetch_git () {
 }
 
 select_prevxenbranch () {
-	local b
-	local p
-	for b in $(./mg-list-all-branches) ; do # already sorted by version
-		case "$b" in
-		xen*)
-			if [ "x$b" = "x$xenbranch" ] ; then
-				break
-			else
-				p=$b
-			fi
-			;;
-		*)	;;
-		esac
-	done
-	prevxenbranch=$p
+	prevxenbranch=`./cri-getprevxenbranch $xenbranch`
 }
 
 select_xenbranch () {
diff --git a/cri-getprevxenbranch b/cri-getprevxenbranch
new file mode 100755
index 0000000..dce52c2
--- /dev/null
+++ b/cri-getprevxenbranch
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+xenbranch=$1
+p=
+
+for b in $(./mg-list-all-branches) ; do # already sorted by version
+    case "$b" in
+	xen*)
+	    if [ "x$b" = "x$xenbranch" ] ; then
+		break
+	    else
+		p=$b
+	    fi
+	    ;;
+	*)	;;
+    esac
+done
+
+echo $p
-- 
2.5.1

Re: [PATCH OSSTEST] cri-common: Refactor select_prevxenbranch to cri-getprevxenbranch

[Ian Jackson]

Ian Campbell writes ("[PATCH OSSTEST] cri-common: Refactor select_prevxenbranch to cri-getprevxenbranch"):
> This moves it outside any prevailing set -x and reduces the amount of
> noise in various logs.
...
> +#!/bin/bash
> +
> +xenbranch=$1

Missing set -e.

Ian.

Re: [PATCH OSSTEST] cri-common: Refactor select_prevxenbranch to cri-getprevxenbranch

[Ian Campbell]

On Fri, 2015-09-11 at 15:38 +0100, Ian Jackson wrote:
> Ian Campbell writes ("[PATCH OSSTEST] cri-common: Refactor
> select_prevxenbranch to cri-getprevxenbranch"):
> > This moves it outside any prevailing set -x and reduces the amount of
> > noise in various logs.
> ...
> > +#!/bin/bash
> > +
> > +xenbranch=$1
> 
> Missing set -e.

So it is, oops.

8>---------------

>From 884b2571763164d7964de1d4dd6fd71ee1a4b6e9 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 11 Sep 2015 10:52:49 +0100
Subject: [PATCH OSSTEST v2] cri-common: Refactor select_prevxenbranch to
 cri-getprevxenbranch
To: osstest

This moves it outside any prevailing set -x and reduces the amount of
noise in various logs.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
v2: set -e
---
 cri-common           | 16 +---------------
 cri-getprevxenbranch | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100755 cri-getprevxenbranch

diff --git a/cri-common b/cri-common
index 94696ab..2669485 100644
--- a/cri-common
+++ b/cri-common
@@ -61,21 +61,7 @@ repo_tree_rev_fetch_git () {
 }
 
 select_prevxenbranch () {
-	local b
-	local p
-	for b in $(./mg-list-all-branches) ; do # already sorted by version
-		case "$b" in
-		xen*)
-			if [ "x$b" = "x$xenbranch" ] ; then
-				break
-			else
-				p=$b
-			fi
-			;;
-		*)	;;
-		esac
-	done
-	prevxenbranch=$p
+	prevxenbranch=`./cri-getprevxenbranch $xenbranch`
 }
 
 select_xenbranch () {
diff --git a/cri-getprevxenbranch b/cri-getprevxenbranch
new file mode 100755
index 0000000..37ea0ee
--- /dev/null
+++ b/cri-getprevxenbranch
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+xenbranch=$1
+p=
+
+set -e
+
+for b in $(./mg-list-all-branches) ; do # already sorted by version
+    case "$b" in
+	xen*)
+	    if [ "x$b" = "x$xenbranch" ] ; then
+		break
+	    else
+		p=$b
+	    fi
+	    ;;
+	*)	;;
+    esac
+done
+
+echo $p
-- 
2.5.1