From 09f9737d26f8edaf657d50657651f8f687f7db06 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 15 Feb 2011 05:44:15 +0000
Subject: [PATCH] add pack200 to promote script
---
releng.control/addRepoProperties.sh | 6 ++++--
releng.control/promote.sh | 15 ++++++++++-----
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/releng.control/addRepoProperties.sh b/releng.control/addRepoProperties.sh
index 20689bcc8..e4fff0dba 100644
--- a/releng.control/addRepoProperties.sh
+++ b/releng.control/addRepoProperties.sh
@@ -25,13 +25,15 @@ BUILD_BRANCH=$2
BUILD_ID=$3
STATS_TAG_SUFFIX=$4
-if [[ -z REPO ]]
+if [[ -z "${REPO}" ]]
then
echo "ERROR: this script requires a repository to add properties to.";
exit 1;
fi
-echo "BUILD_BRANCH: ${}
+echo "BUILD_BRANCH: ${BUILD_BRANCH}";
+echo "BUILD_ID: ${BUILD_ID}";
+echo "STATS_TAG_SUFFIX: ${STATS_TAG_SUFFIX}";
if [[ \( ! \( -z "${BUILD_BRANCH"} \) \) -a \( ! \( -z "${BUILD_ID}" \) \) ]]
then
diff --git a/releng.control/promote.sh b/releng.control/promote.sh
index 2939e878b..a1fe8ddaa 100755
--- a/releng.control/promote.sh
+++ b/releng.control/promote.sh
@@ -187,11 +187,16 @@ fi
# TODO: we currently do not add properties to tests repo ... maybe should? for mirror URL, at least.
# TODO: a fourth argument can be specified to provide stats suffix
# such as _helios_SR2, _indigo_SR0 ... but, takes some customization updated fairly often, to be accurate.
-if [[ $addProperties -a \( -d "${repoDirLocation}" \) ]]
-then
- ${RELENG_CONTROL}/addRepoProperties.sh "${repoDirLocation}" "${buildBranch}" "${dropDirName}"
-fi
-
+if [[ $addProperties ]]
+then
+ repoDirLocation=$FROMDIR/repository
+ if [[ -d "${repoDirLocation}" ]]
+ then
+ ${RELENG_CONTROL}/addRepoProperties.sh "${repoDirLocation}" "${buildBranch}" "${dropDirName}"
+ else
+ echo "ERROR: addProperties requested, but repo location does not exist: ${repoDirLocation}";
+ fi
+fi
if [ "patches" == $distribution ]
then
--
GitLab