Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* pisi klasörler için conflict vermesin.

Browse Source
This commit is contained in:
Faik Uygur
2006-07-03 07:37:18 +00:00
parent b740c03018
commit ea13c68f62
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/atomicoperations.py
+2 -1
View File
@@ -161,7 +161,8 @@ class Install(AtomicOperation):
for file in self.files.list: for file in self.files.list:
if ctx.filesdb.has_file(file.path): if ctx.filesdb.has_file(file.path):
pkg, existing_file = ctx.filesdb.get_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) ) file_conflicts.append( (pkg, existing_file) )
if file_conflicts: if file_conflicts:
file_conflicts_str = "" file_conflicts_str = ""