subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1485362 - in /subversion/branches/1.7.x: ./ STATUS get-deps.sh
Date Wed, 22 May 2013 19:33:13 GMT
Author: svn-role
Date: Wed May 22 19:33:13 2013
New Revision: 1485362

URL: http://svn.apache.org/r1485362
Log:
Merge the r1421541 group from trunk:

 * r1421541, r1424977
   Fix infinite recursion in './get-deps.sh'.
   Justification:
     Trivial fix to plug an edge case.
   Votes:
     -0: rhuijben (Is this needed on this branch?)
     +1: breser, stsp, danielsh (as much as it's needed on trunk)

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:r1421541,1424977

Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1485362&r1=1485361&r2=1485362&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed May 22 19:33:13 2013
@@ -176,14 +176,6 @@ Veto-blocked changes:
 Approved changes:
 =================
 
- * r1421541, r1424977
-   Fix infinite recursion in './get-deps.sh'.
-   Justification:
-     Trivial fix to plug an edge case.
-   Votes:
-     -0: rhuijben (Is this needed on this branch?)
-     +1: breser, stsp, danielsh (as much as it's needed on trunk)
-
  * r1434128, r1434435, r1434476
    Fix issue #4034, 'blame on files with non-native eol-style sees every
    line as modified'.

Modified: subversion/branches/1.7.x/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/get-deps.sh?rev=1485362&r1=1485361&r2=1485362&view=diff
==============================================================================
--- subversion/branches/1.7.x/get-deps.sh (original)
+++ subversion/branches/1.7.x/get-deps.sh Wed May 22 19:33:13 2013
@@ -122,7 +122,11 @@ get_deps() {
 
     if [ $# -gt 0 ]; then
       for target in "$@"; do
-        get_$target || usage
+        if [ "$target" != "deps" ]; then
+          get_$target || usage
+        else
+          usage
+        fi
       done
     else
       get_apr



Mime
View raw message