From be8be07c1f227ebac246d3b3d62bf1009c9ceda2 Mon Sep 17 00:00:00 2001
From: Fabian Schmengler <fs@integer-net.de>
Date: Fri, 22 May 2015 15:59:35 +0200
Subject: [PATCH] Use full path when checking for conflicts

Otherwise the target might not be resolved with realpath() and we get false positives
---
 modman.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modman.php b/modman.php
index 857502c..1990819 100644
--- a/modman.php
+++ b/modman.php
@@ -557,7 +557,8 @@ public function doDeploy($bForce = false, $bCopy = false) {
 				if (!is_dir($sDirectoryName)) {
 					$oConflicts->checkForConflict($sDirectoryName, 'dir');
 				}
-				$oConflicts->checkForConflict($oLine->getSymlink(), 'link', $oLine->getTarget());
+				$sFullTarget = $sTarget . DIRECTORY_SEPARATOR . $oLine->getTarget();
+				$oConflicts->checkForConflict($oLine->getSymlink(), 'link', $sFullTarget);
 			} else {
 				unset($aLines[$iLine]);
 			}