Introduce -Suu

If the user switches from unstable repo to a stable one, it is quite hard to
sync its system with the new repo (the user will see many "Local is newer
than stable" messages, nothing more). That's why I introduced -Suu, which
treats a sync package like an upgrade, iff the package version doesn't match
with the local one's.

I added a new pactest (sync104.py) to test this, and I updated the
documentation of -Su.

Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
[Dan: slight doc reword]
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 15 insertions, 3 deletions

diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c
index ffcddf98..47639248 100644
--- a/lib/libalpm/sync.c
+++ b/lib/libalpm/sync.c
@@ -80,7 +80,7 @@ pmpkg_t SYMEXPORT *alpm_sync_newversion(pmpkg_t *pkg, alpm_list_t *dbs_sync)
 	return(NULL);
 }
 
-int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync)
+int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync, int enable_downgrade)
 {
 	alpm_list_t *i, *j, *k;
 
@@ -116,8 +116,20 @@ int _alpm_sync_sysupgrade(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_s
 						trans->packages = alpm_list_add(trans->packages, spkg);
 					}
 				} else if(cmp < 0) {
-					_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
-							lpkg->name, lpkg->version, sdb->treename, spkg->version);
+					if(enable_downgrade) {
+						/* check IgnorePkg/IgnoreGroup */
+						if(_alpm_pkg_should_ignore(spkg) || _alpm_pkg_should_ignore(lpkg)) {
+							_alpm_log(PM_LOG_WARNING, _("%s: ignoring package downgrade (%s => %s)\n"),
+											lpkg->name, lpkg->version, spkg->version);
+						} else {
+							_alpm_log(PM_LOG_WARNING, _("%s: downgrading from version %s to version %s\n"),
+											lpkg->name, lpkg->version, spkg->version);
+							trans->packages = alpm_list_add(trans->packages, spkg);
+						}
+					} else {
+						_alpm_log(PM_LOG_WARNING, _("%s: local (%s) is newer than %s (%s)\n"),
+								lpkg->name, lpkg->version, sdb->treename, spkg->version);
+					}
 				}
 				break; /* jump to next local package */
 			} else { /* 2. search for replacers in sdb */