Kaydet (Commit) 956276cd authored tarafından Suleyman Poyraz's avatar Suleyman Poyraz

Fixed filesdb based error: When removing package now not remove conflict files

üst 69cc8cf7
......@@ -621,10 +621,10 @@ class Remove(AtomicOperation):
# package (this can legitimately occur while upgrading
# two packages such that a file has moved from one package to
# another as in #2911)
#pkg, existing_file = ctx.filesdb.get_file(fileinfo.path)
#if pkg != package_name:
# ctx.ui.warning(_('Not removing conflicted file : {}').format(fpath))
# return
pkg, existing_file = ctx.filesdb.get_file(fileinfo.path)
if pkg != package_name:
ctx.ui.warning(_('Not removing conflicted file : {}').format(fpath))
return
if fileinfo.type == ctx.const.conf:
# config files are precious, leave them as they are
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment