From f4b4837a81a1c368dd7df0a9ee037c645cf143ca Mon Sep 17 00:00:00 2001 From: Faik Uygur Date: Tue, 27 Jan 2009 10:26:21 +0000 Subject: [PATCH] After accepting the packages to be installed/removed for a takeback operation, do not warn and ask about any package operation. BUG:FIXED:8811 --- pisi/operations/history.py | 2 +- pisi/operations/install.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pisi/operations/history.py b/pisi/operations/history.py index 27cf1492..39a5b352 100644 --- a/pisi/operations/history.py +++ b/pisi/operations/history.py @@ -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) diff --git a/pisi/operations/install.py b/pisi/operations/install.py index 3b9bc2b2..8ddd4f21 100644 --- a/pisi/operations/install.py +++ b/pisi/operations/install.py @@ -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