After accepting the packages to be installed/removed for a takeback operation,
do not warn and ask about any package operation. BUG:FIXED:8811
This commit is contained in:
@@ -155,7 +155,7 @@ def takeback(operation):
|
||||
pisi.operations.remove.remove(beremoved, True, True)
|
||||
|
||||
if paths:
|
||||
pisi.operations.install.install_pkg_files(paths)
|
||||
pisi.operations.install.install_pkg_files(paths, True)
|
||||
|
||||
for pkg, operation in configs:
|
||||
historydb.load_config(operation, pkg)
|
||||
|
||||
@@ -100,7 +100,7 @@ def install_pkg_names(A, reinstall = False):
|
||||
|
||||
return True
|
||||
|
||||
def install_pkg_files(package_URIs):
|
||||
def install_pkg_files(package_URIs, reinstall = False):
|
||||
"""install a number of pisi package files"""
|
||||
|
||||
ctx.ui.debug('A = %s' % str(package_URIs))
|
||||
@@ -112,7 +112,7 @@ def install_pkg_files(package_URIs):
|
||||
if ctx.config.get_option('ignore_dependency'):
|
||||
# simple code path then
|
||||
for x in package_URIs:
|
||||
atomicoperations.install_single_file(x)
|
||||
atomicoperations.install_single_file(x, reinstall)
|
||||
return True
|
||||
|
||||
# read the package information into memory first
|
||||
@@ -207,7 +207,7 @@ in the respective order to satisfy extra dependencies:
|
||||
ctx.ui.notify(ui.packagestogo, order = order)
|
||||
|
||||
for x in order:
|
||||
atomicoperations.install_single_file(dfn[x])
|
||||
atomicoperations.install_single_file(dfn[x], reinstall)
|
||||
|
||||
return True
|
||||
|
||||
|
||||
Reference in New Issue
Block a user