From 9482815b711558ce7b11271a63cba31cf7d71c4e Mon Sep 17 00:00:00 2001 From: Michael Scherer Date: Sun, 17 Nov 2013 14:18:34 +0100 Subject: [PATCH] Fix behavior of urpmi module where it always return "changed" even when a package is already installed, since urpmi will always return 0 wether it install or not. --- library/packaging/urpmi | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/library/packaging/urpmi b/library/packaging/urpmi index 4ff01a74130..ac96a9d74fa 100644 --- a/library/packaging/urpmi +++ b/library/packaging/urpmi @@ -90,6 +90,13 @@ def query_package(module, name): else: return False +def query_package_provides(module, name): + + # rpm -q returns 0 if the package is installed, + # 1 if it is not installed + rc = os.system("rpm -q --provides %s >/dev/null" % (name)) + return rc == 0 + def update_package_db(module): rc = os.system("urpmi.update -a -q") @@ -125,7 +132,8 @@ def install_packages(module, pkgspec, force=True, no_suggests=True): packages = "" for package in pkgspec: - packages += "'%s' " % package + if not query_package_provides(module, package): + packages += "'%s' " % package if len(packages) != 0: if no_suggests: