Demon has submitted this change and it was merged. Change subject: Revert "Updating gerrit to 2.6-rc0-7-g6e5cc39" ......................................................................
Revert "Updating gerrit to 2.6-rc0-7-g6e5cc39" We won't be deploying this build--wasn't actually put in apt repo. This reverts commit 8a74770c690aac37cf44dfcf2f69dc17d136831c Change-Id: I83ce8a555cf39b96939a0f1c5c310459c5332400 --- M debian/changelog M debian/gerrit.init 2 files changed, 23 insertions(+), 24 deletions(-) Approvals: Demon: Verified; Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index 5d37c93..09c227e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,3 @@ -gerrit (2.6-rc0-7-g6e5cc39-1) precise-wikimedia; urgency=low - - * Updating for 2.6-rc0-7-g6e5cc39 - - -- Chad Horohoe <[email protected]> Fri, 22 Mar 2013 16:31:56 +0000 - gerrit (2.5.2-1636-g353e384-1) precise-wikimedia; urgency=low * Updating for 2.5.2-1636-g353e384 diff --git a/debian/gerrit.init b/debian/gerrit.init index 9aa4ea3..d43c322 100755 --- a/debian/gerrit.init +++ b/debian/gerrit.init @@ -119,7 +119,7 @@ ################################################## # See if there's a default configuration file ################################################## -if test -f /etc/default/gerritcodereview ; then +if test -f /etc/default/gerritcodereview ; then . /etc/default/gerritcodereview fi @@ -150,9 +150,20 @@ # Try to determine GERRIT_SITE if not set ################################################## if test -z "$GERRIT_SITE" ; then - GERRIT_SITE_1=`dirname "$0"`/.. - if test -f "${GERRIT_SITE_1}/${GERRIT_INSTALL_TRACE_FILE}" ; then - GERRIT_SITE=${GERRIT_SITE_1} + GERRIT_SITE_1=`dirname "$0"` + + ################################################## + # As last resort assume we started the script from + # the bin directory of the Gerrit installation + ################################################## + if [ "$GERRIT_SITE_1" = "." ]; then + GERRIT_SITE_1=`pwd` + fi + + GERRIT_SITE_1=`dirname "$GERRIT_SITE_1"` + + if test -f "${GERRIT_SITE_1}/${GERRIT_INSTALL_TRACE_FILE}" ; then + GERRIT_SITE=${GERRIT_SITE_1} fi fi @@ -160,11 +171,10 @@ # No GERRIT_SITE yet? We're out of luck! ################################################## if test -z "$GERRIT_SITE" ; then - echo >&2 "** ERROR: GERRIT_SITE not set" + echo >&2 "** ERROR: GERRIT_SITE not set" exit 1 fi -INITIAL_DIR=`pwd` if cd "$GERRIT_SITE" ; then GERRIT_SITE=`pwd` else @@ -217,7 +227,7 @@ " for N in java jdk jre ; do for L in $JAVA_LOCATIONS ; do - test -d "$L" || continue + test -d "$L" || continue find $L -name "$N" ! -type d | grep -v threads | while read J ; do test -x "$J" || continue VERSION=`eval "$J" -version 2>&1` @@ -353,7 +363,7 @@ start) printf '%s' "Starting Gerrit Code Review: " - if test 1 = "$NO_START" ; then + if test 1 = "$NO_START" ; then echo "Not starting gerrit - NO_START=1 in /etc/default/gerritcodereview" exit 0 fi @@ -378,7 +388,7 @@ echo >&2 "fatal: start-stop-daemon failed" rc=1 fi - exit $rc + exit $rc fi else if test -f "$GERRIT_PID" ; then @@ -390,7 +400,7 @@ fi fi - if test $UID = 0 -a -n "$GERRIT_USER" ; then + if test $UID = 0 -a -n "$GERRIT_USER" ; then touch "$GERRIT_PID" chown $GERRIT_USER "$GERRIT_PID" su - $GERRIT_USER -s /bin/sh -c " @@ -439,7 +449,7 @@ if test 1 = "$START_STOP_DAEMON" && type start-stop-daemon >/dev/null 2>&1 then - start-stop-daemon -K -p "$GERRIT_PID" -s HUP + start-stop-daemon -K -p "$GERRIT_PID" -s HUP sleep 1 if running "$GERRIT_PID" ; then sleep 3 @@ -471,13 +481,8 @@ if test -f "$GERRIT_SH" ; then : OK else - GERRIT_SH="$INITIAL_DIR/$GERRIT_SH" - if test -f "$GERRIT_SH" ; then - : OK - else - echo >&2 "** ERROR: Cannot locate gerrit.sh" - exit 1 - fi + echo >&2 "** ERROR: Cannot locate gerrit.sh" + exit 1 fi $GERRIT_SH stop $* sleep 5 -- To view, visit https://gerrit.wikimedia.org/r/55610 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I83ce8a555cf39b96939a0f1c5c310459c5332400 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/gerrit Gerrit-Branch: master Gerrit-Owner: Demon <[email protected]> Gerrit-Reviewer: Demon <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
