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

* fix: report file conflicts as errors

Browse Source
This commit is contained in:
Eray Özkural
2006-06-12 09:59:02 +00:00
parent 617ce9784e
commit d7d2cc2bc7
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/atomicoperations.py
+7 -2
View File
@@ -154,12 +154,17 @@ class Install(AtomicOperation):
ctx.packagedb.add_package(self.pkginfo, pisi.itembyrepodb.thirdparty) ctx.packagedb.add_package(self.pkginfo, pisi.itembyrepodb.thirdparty)
# check file conflicts # check file conflicts
file_conflicts = []
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: if pkg != self.pkginfo.name:
#raise Error(_('Trying to overwrite an existing file: %s') % file.path) file_conflicts.append( (pkg, existing_file) )
ctx.ui.warning(_('Trying to overwrite an existing file: %s') % file.path) if file_conflicts:
file_conflicts_str = ""
for (pkg, existing_file) in file_conflicts:
file_conflicts_str += _("%s from %s package") % (existing_file.path, pkg)
raise Error(_('File conflicts:\n%s') % file_conflicts_str)
def check_reinstall(self): def check_reinstall(self):
"check reinstall, confirm action, and schedule reinstall" "check reinstall, confirm action, and schedule reinstall"