From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Apr 2013 00:12:33 +0000 (+1000)
Subject: the control files has moved to ../etc, so use it from there
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=11517024b2c84f2e0eb128adc11e36b0c590954b;p=next-scripts

the control files has moved to ../etc, so use it from there
---

diff --git a/check_left b/check_left
index 553bd90..bcdf81e 100755
--- a/check_left
+++ b/check_left
@@ -9,7 +9,7 @@ log()
 	echo "$@" | tee -a $LOG_FILE
 }
 
-heads=$(grep -v '^#' ../real_control | awk -F '	' '$2=="quilt" { printf("quilt/%s ", $3); } $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' ../etc/control | awk -F '	' '$2=="quilt" { printf("quilt/%s ", $3); } $2=="git" { printf("%s/%s ", $3, $5); }')
 
 for h in $heads; do
 	echo $h
diff --git a/do_merge b/do_merge
index 13fd3c9..59f1ea9 100755
--- a/do_merge
+++ b/do_merge
@@ -107,7 +107,7 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' ../etc/control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 
 need_build=false
 
@@ -168,7 +168,7 @@ for h in $heads; do
 	}
 	$need_build ||
 		continue
-	do_build=$(grep -v '^#' ../real_control | awk -F '	' '$3=="'$tree'" { print $6; }')
+	do_build=$(grep -v '^#' ../etc/control | awk -F '	' '$3=="'$tree'" { print $6; }')
 	[ "$do_build" = "yes" ] ||
 		continue
 	git push -f "$build_host":"$build_dir" master:refs/heads/next || {
diff --git a/fetch_trees b/fetch_trees
index d2f476a..29f22a9 100755
--- a/fetch_trees
+++ b/fetch_trees
@@ -4,13 +4,13 @@ origwd=$(pwd)
 
 get_field()
 {
-	grep -v '^#' ../real_control |
+	grep -v '^#' ../etc/control |
 		awk -F '\t' '$3 == "'$1'" { print $'$2'; }'
 }
 
 trees="$@"
 [ "$trees" ] ||
-	trees=$(grep -v '^#' ../real_control | awk -F '\t' '{ print $3 }')
+	trees=$(grep -v '^#' ../etc/control | awk -F '\t' '{ print $3 }')
 
 for name in $trees; do
 	type=$(get_field "$name" 2)
diff --git a/make_tree_file b/make_tree_file
index 9c5bdb2..f1a7e32 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -31,7 +31,7 @@ while read email type name url ref build; do
 	[ "${ref%:*}" = "${ref}" ] || ref=${ref##*:}
 	[ "$type" = "git" ] && url="$url#$ref"
 	printf "%s$tab%s\t%s\n" $name $type $url >>Next/Trees
-done <../real_control
+done <../etc/control
 )
 
 mv ../SHA1s Next/SHA1s
diff --git a/message_helper b/message_helper
index 3d9e80c..80bf255 100755
--- a/message_helper
+++ b/message_helper
@@ -2,8 +2,8 @@
 
 log=../merge.log
 [ -f merge.log ] && log=merge.log
-control=../real_control
-[ -f real_control ] && control=real_control
+control=../etc/control
+[ -f control ] && control=control
 
 branch=""
 [ "$1" = "-t" ] && {
diff --git a/update_trees b/update_trees
index a9622cc..6841b5b 100755
--- a/update_trees
+++ b/update_trees
@@ -17,14 +17,14 @@ execute()
 
 cpwd=$(pwd)
 
-quilters=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" { print $3; }')
+quilters=$(grep -v '^#' ../etc/control | awk -F '\t' '$2=="quilt" { print $3; }')
 
 for name in $quilters; do
 
 	sfile="../quilt/$name/series"
 	base=$(sed -n 's/^#[ \t]*NEXT[-_]BASE[ \t]*\([^ \t]*\)[ \t]*$/\1/p' "$sfile")
 	if [ -n "$base" ]; then
-		nbase=$(grep -v '^#' ../real_control | awk -F '\t' '$3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }')
+		nbase=$(grep -v '^#' ../etc/control | awk -F '\t' '$3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }')
 		[ -n "$nbase" ] && base="$nbase"
 	else
 		base=$(sed -n 's/^#[ \t]*BASE[ \t]*\(.*\)[ \t]*$/\1/p' "$sfile")