Changeset 196ff59

Timestamp:

11/11/11 23:04:16 (6 months ago)

Author:

mrook

Branches:

master

Children:

2baac48

Parents:

85f3723

git-author:

Michiel Rook <mrook@…> (11/11/11 23:04:16)

git-committer:

Michiel Rook <mrook@…> (11/11/11 23:04:16)

Message:

Fixes #818 - add overwrite option to symlink task

Files:

• classes/phing/tasks/ext/SymlinkTask.php (modified) (4 diffs)
• docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html (modified) (1 diff)

classes/phing/tasks/ext/SymlinkTask.php

@@ -83 +83 @@
     
     /**
+     * Whether to override the symlink if it exists but points
+     * to a different location
+     *
+     * (default value: false)
+     *
+     * @var boolean
+     * @access private
+     */
+    private $_overwrite = false;
+
+    /**
      * setter for _target
      * 
@@ -117 +128 @@
         return $this->_filesets[$num-1];
     }
-    
+
+    /**
+     * setter for _overwrite
+     *
+     * @access public
+     * @param boolean $overwrite
+     * @return void
+     */
+    public function setOverwrite($overwrite)
+    {
+        $this->_overwrite = $overwrite;
+    }
+
     /**
      * getter for _target
@@ -158 +181 @@
         return $this->_filesets;
     }
-    
+
+    /**
+     * getter for _overwrite
+     *
+     * @access public
+     * @return boolean
+     */
+    public function getOverwrite()
+    {
+        return $this->_overwrite;
+    }
+
     /**
      * Generates an array of directories / files to be linked
@@ -249 +283 @@
     protected function symlink($target, $link)
     {
-        if(file_exists($link)) {
-            $this->log('Link exists: ' . $link, Project::MSG_ERR);
-            return false;
+        if (file_exists($link)) {
+            if (!is_link($link)) {
+                $this->log('File exists: ' . $link, Project::MSG_ERR);
+                return false;
+            }
+
+            if (readlink($link) == $target || !$this->getOverwrite()) {
+                $this->log('Link exists: ' . $link, Project::MSG_ERR);
+                return false;
+            }
+
+            unlink($link);
         }
     

docs/phing_guide/book/chapters/appendixes/AppendixC-OptionalTasks.html

@@ -7203 +7203 @@
                                 <td>Yes</td>
                         </tr>
+                        <tr>
+                                <td>overwrite</td>
+                                <td>Boolean</td>
+                                <td>Whether to override the symlink if it exists but points 
+                                to a different location</td>
+                                <td>false</td>
+                                <td>No</td>
+                        </tr>
                 </tbody>
         </table>