pmsyncpkg_t cleanup

Fix for sync044.py and reason001.py.
Rename sync->data to sync->removes (alpm_list_t *)
Replace pmsynctype_t sync->type by pmpkgreason_t sync->newreason

The type field was set to UPGRADE or DEPEND or REPLACE.
Instead of using type = UPGRADE or DEPEND, we now rather use a
"pmpkgreason_t newreason" field directly (= explicit or depend) which allows
a better handling of the install reason.
And the REPLACE type is now deduced implicitly when the sync->removes list
is not empty.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 11 insertions, 14 deletions

diff --git a/src/pacman/util.c b/src/pacman/util.c
index 19e64442..c646d7aa 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -409,20 +409,17 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local)
 		pmsyncpkg_t *sync = alpm_list_getdata(i);
 		pmpkg_t *pkg = alpm_sync_get_pkg(sync);
 
-		/* If this sync record is a replacement, the data member contains
-		 * a list of packages to be removed due to the package that is being
-		 * installed. */
-		if(alpm_sync_get_type(sync) == PM_SYNC_TYPE_REPLACE) {
-			alpm_list_t *to_replace = alpm_sync_get_data(sync);
-
-			for(j = to_replace; j; j = alpm_list_next(j)) {
-				pmpkg_t *rp = alpm_list_getdata(j);
-				const char *name = alpm_pkg_get_name(rp);
-
-				if(!alpm_list_find_str(to_remove, name)) {
-					rsize += alpm_pkg_get_isize(rp);
-					to_remove = alpm_list_add(to_remove, strdup(name));
-				}
+		/* The removes member contains a list of packages to be removed
+		 * due to the package that is being installed. */
+		alpm_list_t *to_replace = alpm_sync_get_removes(sync);
+
+		for(j = to_replace; j; j = alpm_list_next(j)) {
+			pmpkg_t *rp = alpm_list_getdata(j);
+			const char *name = alpm_pkg_get_name(rp);
+
+			if(!alpm_list_find_str(to_remove, name)) {
+				rsize += alpm_pkg_get_isize(rp);
+				to_remove = alpm_list_add(to_remove, strdup(name));
 			}
 		}