Remove duplicated get_upgrades function, use sysupgrade instead.

The alpm_get_upgrades was exactly the same as find_replacements +
_alpm_sync_sysupgrade, except that it automatically made the eventual
replacements, without asking the user : Replace %s with %s/%s? [Y/n]

The replace question, asked in find_replacements. can now be skipped by
using a NULL trans argument, so that we get the same behavior as with
alpm_get_upgrades.

So alpm_db_get_upgrades() can now be replaced by
alpm_sync_sysupgrade(db_local, syncdbs).

Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 0 insertions, 144 deletions

diff --git a/lib/libalpm/db.c b/lib/libalpm/db.c
index 23b28d27..f511c714 100644
--- a/lib/libalpm/db.c
+++ b/lib/libalpm/db.c
@@ -47,8 +47,6 @@
 #include "cache.h"
 #include "alpm.h"
 
-#include "sync.h" /* alpm_db_get_upgrades() */
-
 /** \addtogroup alpm_databases Database Functions
  * @brief Functions to query and manipulate the database of libalpm
  * @{
@@ -436,148 +434,6 @@ alpm_list_t SYMEXPORT *alpm_db_search(pmdb_t *db, const alpm_list_t* needles)
 	return(_alpm_db_search(db, needles));
 }
 
-/* This function is mostly the same as sync.c find_replacements and sysupgrade
- * functions, and we should be able to combine them - this is an interim
- * solution made for -Qu operation */
-/** Get a list of upgradable packages on the current system
- * @return a pmsyncpkg_t list of packages that are out of date
- */
-alpm_list_t SYMEXPORT *alpm_db_get_upgrades(void)
-{
-	alpm_list_t *syncpkgs = NULL;
-	const alpm_list_t *i, *j, *k, *m;
-
-	ALPM_LOG_FUNC;
-
-	/* TODO holy nested loops, Batman! */
-	/* check for "recommended" package replacements */
-	_alpm_log(PM_LOG_DEBUG, "checking for package replacements\n");
-	for(i = handle->dbs_sync; i; i = i->next) {
-		for(j = _alpm_db_get_pkgcache(i->data); j; j = j->next) {
-			pmpkg_t *spkg = j->data;
-
-			for(k = alpm_pkg_get_replaces(spkg); k; k = k->next) {
-
-				for(m = _alpm_db_get_pkgcache(handle->db_local); m; m = m->next) {
-					pmpkg_t *lpkg = m->data;
-
-					if(strcmp(k->data, alpm_pkg_get_name(lpkg)) == 0) {
-						_alpm_log(PM_LOG_DEBUG, "checking replacement '%s' for package '%s'\n",
-								(char *)k->data, alpm_pkg_get_name(spkg));
-						if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) {
-							_alpm_log(PM_LOG_WARNING, _("%s-%s: ignoring package upgrade (to be replaced by %s-%s)\n"),
-												alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
-												alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
-						} else {
-							/* assume all replaces=() packages are accepted */
-							pmsyncpkg_t *sync = NULL;
-							pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(lpkg), NULL);
-							if(dummy == NULL) {
-								pm_errno = PM_ERR_MEMORY;
-								goto error;
-							}
-
-							pmsyncpkg_t *syncpkg;
-							syncpkg = _alpm_sync_find(syncpkgs, alpm_pkg_get_name(spkg));
-
-							if(syncpkg) {
-								/* found it -- just append to the replaces list */
-								sync->data = alpm_list_add(sync->data, dummy);
-							} else {
-								/* none found -- enter pkg into the final sync list */
-								sync = _alpm_sync_new(PM_SYNC_TYPE_REPLACE, spkg, NULL);
-								if(sync == NULL) {
-									_alpm_pkg_free(dummy);
-									pm_errno = PM_ERR_MEMORY;
-									goto error;
-								}
-								sync->data = alpm_list_add(NULL, dummy);
-								syncpkgs = alpm_list_add(syncpkgs, sync);
-							}
-							_alpm_log(PM_LOG_DEBUG, "%s-%s elected for upgrade (to be replaced by %s-%s)\n",
-												alpm_pkg_get_name(lpkg), alpm_pkg_get_version(lpkg),
-												alpm_pkg_get_name(spkg), alpm_pkg_get_version(spkg));
-						}
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	/* now do normal upgrades */
-	for(i = _alpm_db_get_pkgcache(handle->db_local); i; i = i->next) {
-		int replace=0;
-		pmpkg_t *local = i->data;
-		pmpkg_t *spkg = NULL;
-		pmsyncpkg_t *sync;
-
-		for(j = handle->dbs_sync; !spkg && j; j = j->next) {
-			spkg = _alpm_db_get_pkgfromcache(j->data, alpm_pkg_get_name(local));
-		}
-		if(spkg == NULL) {
-			_alpm_log(PM_LOG_DEBUG, "'%s' not found in sync db -- skipping\n",
-					alpm_pkg_get_name(local));
-			continue;
-		}
-
-		/* we don't care about a to-be-replaced package's newer version */
-		for(j = syncpkgs; j && !replace; j=j->next) {
-			sync = j->data;
-			if(sync->type == PM_SYNC_TYPE_REPLACE) {
-				if(_alpm_pkg_find(alpm_pkg_get_name(spkg), sync->data)) {
-					replace=1;
-				}
-			}
-		}
-		if(replace) {
-			_alpm_log(PM_LOG_DEBUG, "'%s' is already elected for removal -- skipping\n",
-								alpm_pkg_get_name(local));
-			continue;
-		}
-
-		if(alpm_pkg_compare_versions(local, spkg)) {
-			_alpm_log(PM_LOG_DEBUG, "%s elected for upgrade (%s => %s)\n",
-								alpm_pkg_get_name(local), alpm_pkg_get_version(local),
-								alpm_pkg_get_version(spkg));
-
-			pmsyncpkg_t *syncpkg;
-			syncpkg	= _alpm_sync_find(syncpkgs, alpm_pkg_get_name(local));
-
-			if(!syncpkg) {
-				/* If package is in the ignorepkg list, skip it */
-				if(_alpm_pkg_should_ignore(spkg)) {
-					continue;
-				}
-				pmpkg_t *dummy = _alpm_pkg_new(alpm_pkg_get_name(local),
-																			 alpm_pkg_get_version(local));
-				if(dummy == NULL) {
-					goto error;
-				}
-				sync = _alpm_sync_new(PM_SYNC_TYPE_UPGRADE, spkg, dummy);
-				if(sync == NULL) {
-					_alpm_pkg_free(dummy);
-					goto error;
-				}
-				syncpkgs = alpm_list_add(syncpkgs, sync);
-			}
-		}
-	}
-
-	return(syncpkgs);
-error:
-	if(syncpkgs) {
-		alpm_list_t *tmp;
-		for(tmp = syncpkgs; tmp; tmp = alpm_list_next(tmp)) {
-			if(tmp->data) {
-				_alpm_sync_free(tmp->data);
-			}
-		}
-		alpm_list_free(syncpkgs);
-	}
-	return(NULL);
-}
-
 /** @} */
 
 pmdb_t *_alpm_db_new(const char *dbpath, const char *treename)