Changeset 8c44f33

Timestamp:

12/17/11 15:42:15 (5 months ago)

Author:

mrook

Branches:

master

Children:

850d3cc

Parents:

2e417d3

git-author:

Michiel Rook <mrook@…> (12/17/11 15:42:15)

git-committer:

Michiel Rook <mrook@…> (12/17/11 15:42:15)

Message:

Fixes #807 - errstr variable is not always set

File:

• classes/phing/tasks/ext/svn/SvnBaseTask.php (modified) (1 diff)

classes/phing/tasks/ext/svn/SvnBaseTask.php

@@ -332 +332 @@
                 $err = current($errs);
                 
-                throw new BuildException("Failed to run the 'svn " . $this->mode . "' command: " . $err['params']['errstr']);
+                $errorMessage = $err['message'];
+                
+                if (isset($err['params']['errstr'])) {
+                    $errorMessage = $err['params']['errstr'];
+                }
+                
+                throw new BuildException("Failed to run the 'svn " . $this->mode . "' command: " . $errorMessage);
             }
         }