From: Sage Weil <sage@inktank.com>
Date: Tue, 25 Sep 2012 15:58:17 +0000 (-0700)
Subject: put debian dist list in separate file
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6704aa67afdb3ee4cbb7789f666fc3cb25831889;p=ceph-build.git

put debian dist list in separate file

So we only chnage it in one place.
---

diff --git a/build_debs.sh b/build_debs.sh
index a61cf4900..15e7f4d2f 100755
--- a/build_debs.sh
+++ b/build_debs.sh
@@ -22,7 +22,7 @@ echo version $cephver
 whoami=`whoami`
 [ "$whoami" != "root" ] && echo "must run as root not $whoami" && usage && exit 1
 
-[ -z "$dists" ] && dists=`cat $releasedir/$cephver/debian_dists`
+[ -z "$dists" ] && dists=`cat $releasedir/$cephver/deb_dists`
 dvers=`cat $releasedir/$cephver/debian_version`
 echo deb vers $dvers
 echo dists $dists
diff --git a/build_dsc.sh b/build_dsc.sh
index 4b101ddbf..dcab2c423 100755
--- a/build_dsc.sh
+++ b/build_dsc.sh
@@ -6,6 +6,9 @@ usage() {
     echo "usage: $0 releasedir vers [debsubver] [dists...]"
 }
 
+bindir=`dirname $0`
+echo "$bindir" | grep -v -q '^/' && bindir=`pwd`"/$bindir"
+
 releasedir=$1
 cephver=$2
 debsubver=$3
@@ -17,10 +20,7 @@ dists="$*"
 [ -z "$releasedir" ] && echo specify releasedir && usage && exit 1
 [ -z "$cephver" ] && echo specify version && usage && exit 1
 [ -z "$debsubver" ] && debsubver=1
-[ -z "$dists" ] && dists="sid wheezy squeeze quantal precise oneiric natty"
-
-bindir=`dirname $0`
-echo "$bindir" | grep -v -q '^/' && bindir=`pwd`"/$bindir"
+[ -z "$dists" ] && dists=`cat $bindir/deb_dists`
 
 debver="$cephver-$debsubver"
 
diff --git a/deb_dists b/deb_dists
new file mode 100644
index 000000000..ce49f538f
--- /dev/null
+++ b/deb_dists
@@ -0,0 +1,7 @@
+sid
+wheezy
+squeeze
+quantal
+precise
+oneiric
+natty
diff --git a/push_to_deb_repo.sh b/push_to_deb_repo.sh
index 328a2940d..f9ee69768 100755
--- a/push_to_deb_repo.sh
+++ b/push_to_deb_repo.sh
@@ -22,7 +22,7 @@ bindir=`dirname $0`
 echo version $cephvers
 echo component $component
 
-[ -z "$dists" ] && dists=`cat $releasedir/$cephvers/debian_dists`
+[ -z "$dists" ] && dists=`cat $releasedir/$cephvers/deb_dists`
 dvers=`cat $releasedir/$cephvers/debian_version`
 echo deb vers $dvers
 echo dists $dists
diff --git a/update_pbuilder.sh b/update_pbuilder.sh
index f9abcf42e..ff31131b9 100755
--- a/update_pbuilder.sh
+++ b/update_pbuilder.sh
@@ -6,12 +6,15 @@ usage() {
     echo "usage: $0 basedir [dists...]"
 }
 
+bindir=`dirname $0`
+echo "$bindir" | grep -v -q '^/' && bindir=`pwd`"/$bindir"
+
 basedir=$1
 shift
 dists=$*
 
 [ ! -d "$basedir" ] && echo specify dir for pbuilder images && usage && exit 1
-[ -z "$dists" ] && dists="sid wheezy squeeze oneiric quantal precise natty"
+[ -z "$dists" ] && dists=`cat deb_dists`
 
 for dist in $dists
 do