From ea13c68f6240b326d77c7a13720f22d52281f19a Mon Sep 17 00:00:00 2001
From: Faik Uygur <faik@pardus.org.tr>
Date: Mon, 3 Jul 2006 07:37:18 +0000
Subject: [PATCH] =?UTF-8?q?*=20pisi=20klas=C3=B6rler=20i=C3=A7in=20conflic?=
 =?UTF-8?q?t=20vermesin.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pisi/atomicoperations.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pisi/atomicoperations.py b/pisi/atomicoperations.py
index 68d7d69b..5fdcab59 100644
--- a/pisi/atomicoperations.py
+++ b/pisi/atomicoperations.py
@@ -161,7 +161,8 @@ class Install(AtomicOperation):
         for file in self.files.list:
             if ctx.filesdb.has_file(file.path):
                 pkg, existing_file = ctx.filesdb.get_file(file.path)
-                if pkg != self.pkginfo.name:
+                dst = pisi.util.join_path(ctx.config.dest_dir(), file.path)
+                if pkg != self.pkginfo.name and not os.path.isdir(dst):
                     file_conflicts.append( (pkg, existing_file) )
         if file_conflicts:
             file_conflicts_str = ""