Fix recurse delete. Add force update_cache feature.

reviewable/pr18780/r1
Konstantin Shalygin 9 years ago
parent df92a0be0a
commit 808177e2c9

@ -60,7 +60,9 @@ options:
force:
description:
- Force remove package, without any checks.
- When removing package - force remove package, without any
checks. When update_cache - force redownload repo
databases.
required: false
default: no
choices: ["yes", "no"]
@ -149,7 +151,12 @@ def query_package(module, pacman_path, name, state="present"):
def update_package_db(module, pacman_path):
cmd = "%s -Sy" % (pacman_path)
if module.params["force"]:
args = "Syy"
else:
args = "Sy"
cmd = "%s -%s" % (pacman_path, args)
rc, stdout, stderr = module.run_command(cmd, check_rc=False)
if rc == 0:
@ -175,14 +182,13 @@ def upgrade(module, pacman_path):
module.exit_json(changed=False, msg='Nothing to upgrade')
def remove_packages(module, pacman_path, packages):
if module.params["recurse"] or module.params["force"]:
if module.params["recurse"]:
args = "Rs"
else:
args = "R"
def remove_packages(module, pacman_path, packages):
if module.params["force"]:
args = "Rdd"
if module.params["recurse"] and module.params["force"]:
args = "Rdds"
else:
args = "R"

Loading…
Cancel
Save