Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 Clarify error messages in *.sh files to mention that if a script is not found it might be because execute permission is needed. git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc5.5.x/trunk@1159311 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS.txt b/STATUS.txt index b358d8d..df6acbc 100644 --- a/STATUS.txt +++ b/STATUS.txt
@@ -25,13 +25,6 @@ PATCHES PROPOSED TO BACKPORT: [ New proposals should be added at the end of the list ] -* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47880 - Clarify error messages in *.sh files to mention that if a script is not - found it might be because execute permission is needed. - http://svn.apache.org/viewvc?rev=1088179&view=rev - +1: kkolinko, markt, jfclere - -1: - * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51042 Don't notify session creation listeners when changing session ID on authentication
diff --git a/container/catalina/src/bin/digest.sh b/container/catalina/src/bin/digest.sh index 4845c20..2bffe2a 100755 --- a/container/catalina/src/bin/digest.sh +++ b/container/catalina/src/bin/digest.sh
@@ -40,6 +40,7 @@ # Check that target executable exists if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" echo "This file is needed to run this program" exit 1 fi
diff --git a/container/catalina/src/bin/shutdown.sh b/container/catalina/src/bin/shutdown.sh index 36fd211..0aa93ef 100755 --- a/container/catalina/src/bin/shutdown.sh +++ b/container/catalina/src/bin/shutdown.sh
@@ -40,6 +40,7 @@ # Check that target executable exists if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" echo "This file is needed to run this program" exit 1 fi
diff --git a/container/catalina/src/bin/startup.sh b/container/catalina/src/bin/startup.sh index 4e4e9fe..1e2e76f 100755 --- a/container/catalina/src/bin/startup.sh +++ b/container/catalina/src/bin/startup.sh
@@ -56,6 +56,7 @@ else if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" echo "This file is needed to run this program" exit 1 fi
diff --git a/container/catalina/src/bin/version.sh b/container/catalina/src/bin/version.sh index b6ed1c6..07ee7f3 100755 --- a/container/catalina/src/bin/version.sh +++ b/container/catalina/src/bin/version.sh
@@ -40,6 +40,7 @@ # Check that target executable exists if [ ! -x "$PRGDIR"/"$EXECUTABLE" ]; then echo "Cannot find $PRGDIR/$EXECUTABLE" + echo "The file is absent or does not have execute permission" echo "This file is needed to run this program" exit 1 fi
diff --git a/container/webapps/docs/changelog.xml b/container/webapps/docs/changelog.xml index 7e368b7..3c93f42 100644 --- a/container/webapps/docs/changelog.xml +++ b/container/webapps/docs/changelog.xml
@@ -143,6 +143,14 @@ </fix> </changelog> </subsection> + <subsection name="Other"> + <changelog> + <update> + Clarify error messages in *.sh files to mention that if a script is + not found it might be because execute permission is needed. (kkolinko) + </update> + </changelog> + </subsection> </section> <section name="Tomcat 5.5.33 (jim)" rtext="released 2011-02-10"> <subsection name="General">