From 49baad48f498d80de8ae94fe7125fb36196d2cb9 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 24 Jan 2012 18:45:50 +0100
Subject: [PATCH] Fixed module-init-tools->kmod update as reported by davehome.

The problem was that required package dependency was installed, but
the version didn't satisfy the requirement and the code unconditionally
assumed an updated existed in repository pool. Now the code checks
package state to set transaction reason.
---
 include/xbps_api.h        |  2 +-
 lib/repository_finddeps.c | 48 ++++++++++++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/include/xbps_api.h b/include/xbps_api.h
index e1c0d7c8..3f32c1a6 100644
--- a/include/xbps_api.h
+++ b/include/xbps_api.h
@@ -56,7 +56,7 @@
  */
 #define XBPS_PKGINDEX_VERSION	"1.4"
 
-#define XBPS_API_VERSION	"20120122-1"
+#define XBPS_API_VERSION	"20120124"
 #define XBPS_VERSION		"0.12"
 
 /**
diff --git a/lib/repository_finddeps.c b/lib/repository_finddeps.c
index 6505745b..431fb8ce 100644
--- a/lib/repository_finddeps.c
+++ b/lib/repository_finddeps.c
@@ -72,7 +72,6 @@ store_dependency(prop_dictionary_t transd,
 		return EINVAL;
 
 	if (xhp->flags & XBPS_FLAG_DEBUG) {
-		xbps_dbg_printf_append("\n");
 		xbps_dbg_printf(" ");
 		for (x = 0; x < *depth; x++)
 			xbps_dbg_printf_append(" ");
@@ -215,7 +214,7 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 			xbps_dbg_printf("");
 			for (x = 0; x < *depth; x++)
 				xbps_dbg_printf_append(" ");
-			xbps_dbg_printf_append("%s requires dependency '%s' ",
+			xbps_dbg_printf_append("%s requires dependency '%s': ",
 			    curpkg ? curpkg : " ", reqpkg);
 		}
 		/*
@@ -293,12 +292,8 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 			if (rv == 0) {
 				/*
 				 * Package is installed but does not match
-				 * the dependency pattern, an update
-				 * needs to be installed.
+				 * the dependency pattern.
 				 */
-				xbps_dbg_printf_append("installed `%s', must "
-				    "be updated.\n", pkgver_q);
-				reason = "update";
 			} else if (rv == 1) {
 				rv = 0;
 				if (state == XBPS_PKG_STATE_UNPACKED) {
@@ -359,8 +354,9 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 			}
 		}
 		/*
-		 * Pass 3: if required dependency is not in repository,
-		 * add pkg into the missing deps array and pass to next one.
+		 * Pass 3: find required dependency in repository pool.
+		 * If dependency does not match add pkg into the missing
+		 * deps array and pass to next one.
 		 */
 		curpkgd = xbps_repository_pool_find_virtualpkg(reqpkg, true);
 		if (curpkgd == NULL) {
@@ -396,10 +392,40 @@ find_repo_deps(prop_dictionary_t transd, 	/* transaction dictionary */
 			}
 		}
 		/*
-		 * Set pkg transaction reason.
+		 * Pass 4: check if new dependency is already installed, due
+		 * to virtual packages.
 		 */
-		prop_dictionary_set_cstring_nocopy(curpkgd, "transaction", reason);
 		prop_dictionary_get_cstring_nocopy(curpkgd, "pkgver", &pkgver_q);
+		tmpd = xbps_find_pkg_dict_installed(pkgver_q, true);
+		if (tmpd == NULL)
+			tmpd = xbps_find_virtualpkg_dict_installed(pkgver_q, true);
+
+		if (tmpd == NULL) {
+			/* dependency not installed */
+			reason = "install";
+			xbps_dbg_printf_append("satisfied by `%s', "
+			    "installing...\n", pkgver_q);
+		} else {
+			/* dependency installed, check its state */
+			state = 0;
+			if ((rv = xbps_pkg_state_dictionary(tmpd, &state)) != 0) {
+				prop_object_release(tmpd);
+				xbps_dbg_printf("failed to check pkg state "
+				    "for `%s': %s\n", pkgver_q, strerror(rv));
+				break;
+			}
+			if (state == XBPS_PKG_STATE_INSTALLED) {
+				reason = "update";
+				xbps_dbg_printf_append("satisfied by `%s', "
+				    "updating...\n", pkgver_q);
+			} else if (state == XBPS_PKG_STATE_UNPACKED) {
+				reason = "install";
+				xbps_dbg_printf_append("satisfied by `%s', "
+				    "installing...\n", pkgver_q);
+			}
+			prop_object_release(tmpd);
+		}
+		prop_dictionary_set_cstring_nocopy(curpkgd, "transaction", reason);
 		/*
 		 * Package is on repo, add it into the transaction dictionary.
 		 */