Author: svn-role
Date: Tue May 14 04:01:32 2013
New Revision: 1482189
URL: http://svn.apache.org/r1482189
Log:
Merge the r1451678 group from trunk:
* r1451678, r1452617
Make get-deps.sh compatible with Solaris /bin/sh.
Justification:
Make get-deps.sh work on Solaris.
Votes:
+1: breser, danielsh, stsp
+0: rhuijben (untested)
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/get-deps.sh
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1451678,1452617
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1482189&r1=1482188&r2=1482189&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Tue May 14 04:01:32 2013
@@ -283,14 +283,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1451678, r1452617
- Make get-deps.sh compatible with Solaris /bin/sh.
- Justification:
- Make get-deps.sh work on Solaris.
- Votes:
- +1: breser, danielsh, stsp
- +0: rhuijben (untested)
-
* r1461743
Set output parameter in non-maintainer builds, in svn_fs_commit_txn().
Justification:
Modified: subversion/branches/1.7.x/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/get-deps.sh?rev=1482189&r1=1482188&r2=1482189&view=diff
==============================================================================
--- subversion/branches/1.7.x/get-deps.sh (original)
+++ subversion/branches/1.7.x/get-deps.sh Tue May 14 04:01:32 2013
@@ -29,7 +29,8 @@ NEON=neon-0.29.6
SERF=serf-0.7.2
ZLIB=zlib-1.2.7
SQLITE_VERSION=3.7.6.3
-SQLITE=sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo $SQLITE_VERSION |
sed -e 's/\./ /g'))
+SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
+SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
HTTPD=httpd-2.2.19
@@ -120,7 +121,7 @@ get_deps() {
done
if [ $# -gt 0 ]; then
- for target; do
+ for target in "$@"; do
get_$target || usage
done
else
