summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-03-16 13:52:28 +0100
committerHolger Levsen <holger@layer-acht.org>2015-03-16 13:52:28 +0100
commit2b6f9c9eb0d7d115e60b2ecd5412d2ce38fb5787 (patch)
treea0d8d219e1d7f6207b52fe188ea5e99318ccb091
parente84bd4035f694c5e0a49e00e4e9381743424963b (diff)
downloadjenkins.debian.net-2b6f9c9eb0d7d115e60b2ecd5412d2ce38fb5787.tar.xz
refactor: rename variable
-rwxr-xr-xbin/reproducible_common.sh5
-rwxr-xr-xbin/reproducible_schedule_on_demand.sh5
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 3df77370..fa56d585 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -88,17 +88,18 @@ schedule_packages() {
}
check_candidates() {
- PACKAGES=""
+ PACKAGE_IDS=""
PACKAGES_NAMES=""
TOTAL=0
for PKG in $CANDIDATES ; do
RESULT=$(sqlite3 -init $INIT ${PACKAGES_DB} "SELECT id, name from sources WHERE name='$PKG' AND suite='$SUITE';")
if [ ! -z "$RESULT" ] ; then
- PACKAGES="$PACKAGES $(echo $RESULT|cut -d '|' -f 1)"
+ PACKAGE_IDS="$PACKAGE_IDS $(echo $RESULT|cut -d '|' -f 1)"
PACKAGES_NAMES="$PACKAGES_NAMES $(echo $RESULT|cut -d '|' -f 2)"
let "TOTAL+=1"
fi
done
+ PACKAGE_IDS=$(echo $PACKAGE_IDS)
case $TOTAL in
1)
PACKAGES_TXT="package"
diff --git a/bin/reproducible_schedule_on_demand.sh b/bin/reproducible_schedule_on_demand.sh
index 0866ea0b..07df687a 100755
--- a/bin/reproducible_schedule_on_demand.sh
+++ b/bin/reproducible_schedule_on_demand.sh
@@ -19,10 +19,9 @@ SUITE="$1"
shift
CANDIDATES="$@"
check_candidates
-if [ ${#PACKAGES} -gt 256 ] ; then
+if [ ${#PACKAGE_IDS} -gt 256 ] ; then
BLABLABLA="..."
fi
-PACKAGES=$(echo $PACKAGES)
ACTION="manually rescheduled"
if [ -n "${BUILD_URL:-}" ] ; then
ACTION="rescheduled by $BUILD_URL"
@@ -30,7 +29,7 @@ fi
MESSAGE="$TOTAL $PACKAGES_TXT $ACTION for $SUITE: ${PACKAGES_NAMES:0:256}$BLABLABLA"
# finally
-schedule_packages $PACKAGES
+schedule_packages $PACKAGE_IDS
echo
echo "$MESSAGE"
if [ -z "${BUILD_URL:-}" ] ; then