db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r1071111 - in /db/derby/code/branches/10.5: ./ bin/setEmbeddedCP
Date Tue, 15 Feb 2011 23:59:32 GMT
Author: mikem
Date: Tue Feb 15 23:59:32 2011
New Revision: 1071111

URL: http://svn.apache.org/viewvc?rev=1071111&view=rev
Log:
DERBY-4283: setEmbeddedCP should use return, not exit, on error

backported change #826263 from trunk to 10.5

Since the setEmbeddedCP script is designed to be called from another
script, or sourced from the shell, it should use 'return' rather than
'exit', to report an error.

This change was contributed by Susumu Ishizuka (susumuishizuka at ieee dot org) 


Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/bin/setEmbeddedCP

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 23:59:32 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.6:942027,957000,962738,965351,987678,997790*,1031623,1055601,1068474
-/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,961892,962716,964039,964402,965647,967304,980089,980684,986689,98
 6834,987539,989099,997325*,999119,1002291,1002682,1002853,1021426,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250
+/db/derby/code/trunk:757811,764912,769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,791027,792001,792254,792434,793089,793588,794106,794276,794303,794955,795166,795459,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,822289,823659,824694,826263,827505,829022,829410,830545,831304,831319,832379,833430,835286,881074,881444,882732,884163,885421,885659,887246,888311,891350,892912,897161,898635,901165,901648,901760,902857,903108,905224,908418,908586,909176,910481,910511,911315,911793,915177,915733,916075,916897,917771,918152,918359,921028,927430,928065,929085,931076,934474,936215,938959,940462,940469,942286,942476,942480,942587,946794,948045,948069,951346,951366,952138,952581,954748,955001,955634,956075,956445,956659,958163,959550,961892,962716,964039,964402,965647,967304,980089,980684,98
 6689,986834,987539,989099,997325*,999119,1002291,1002682,1002853,1021426,1025795,1030043,1040658,1053724,1055169,1062096,1063809,1065061,1067250

Modified: db/derby/code/branches/10.5/bin/setEmbeddedCP
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/bin/setEmbeddedCP?rev=1071111&r1=1071110&r2=1071111&view=diff
==============================================================================
--- db/derby/code/branches/10.5/bin/setEmbeddedCP (original)
+++ db/derby/code/branches/10.5/bin/setEmbeddedCP Tue Feb 15 23:59:32 2011
@@ -20,7 +20,7 @@
 if [ -z "$DERBY_HOME" ] ; then
   echo "Error: DERBY_HOME is not set. Please set the DERBY_HOME environment variable"
   echo "to the location of your Derby installation."
-  exit 1
+  return 1
 fi
 
 export CLASSPATH="${DERBY_HOME}/lib/derby.jar:${DERBY_HOME}/lib/derbytools.jar:${CLASSPATH}"



Mime
View raw message