Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 06D959C01 for ; Tue, 14 May 2013 04:29:04 +0000 (UTC) Received: (qmail 35565 invoked by uid 500); 14 May 2013 04:02:00 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 35532 invoked by uid 500); 14 May 2013 04:02:00 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 35524 invoked by uid 99); 14 May 2013 04:02:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 04:02:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 14 May 2013 04:01:54 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5B87923889ED; Tue, 14 May 2013 04:01:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1482189 - in /subversion/branches/1.7.x: ./ STATUS get-deps.sh Date: Tue, 14 May 2013 04:01:33 -0000 To: commits@subversion.apache.org From: svn-role@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130514040133.5B87923889ED@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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