Attempt #2 at -S/-Su unification: verify that the 'force' option has been read before comparing versions

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c
index 9bc34016..1afaf38c 100644
--- a/lib/libalpm/package.c
+++ b/lib/libalpm/package.c
@@ -125,6 +125,11 @@ void _alpm_pkg_free(void *data)
 /* Is pkgB an upgrade for pkgA ? */
 int alpm_pkg_compare_versions(pmpkg_t *pkgA, pmpkg_t *pkgB)
 {
+	if(spkg->origin == PKG_FROM_CACHE) {
+		/* ensure we have the /desc file, which contains the 'force' option */
+		_alpm_db_read(pkgB->data, INFRQ_DESC, pkgB);
+	}
+
 	if(pkgB->force) {
 		/* skip the version compare call if this is a 'force' package */
 		return(1);
diff --git a/lib/libalpm/package.h b/lib/libalpm/package.h
index dfaec2a2..84274cca 100644
--- a/lib/libalpm/package.h
+++ b/lib/libalpm/package.h
@@ -82,7 +82,7 @@ struct __pmpkg_t {
 	alpm_list_t *conflicts;
 	alpm_list_t *provides;
 	/* internal */
-	unsigned short origin;
+	pmpkgfrom_t origin;
 	void *data;
 	pmdbinfrq_t infolevel;
 };