From 9dd016001eafb69991661d4d8bda91906d51ed78 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 8 Jan 2008 15:49:52 -0600 Subject: Remove upgradedelay and all code associated with it It wasn't even implemented correctly, and it really doesn't have a use if packagers just do their job correctly anyway for a distro. Let's not try to solve a problem with the wrong solution now. Signed-off-by: Dan McGee --- lib/libalpm/package.c | 23 ----------------------- 1 file changed, 23 deletions(-) (limited to 'lib/libalpm/package.c') diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 1293ccff..e79c5b43 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -850,15 +850,6 @@ int alpm_pkg_compare_versions(pmpkg_t *local_pkg, pmpkg_t *pkg) alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), alpm_db_get_name(db), alpm_pkg_get_version(pkg)); cmp = 0; - } else if(cmp > 0) { - /* we have an upgrade, make sure we should actually do it */ - if(_alpm_pkg_istoonew(pkg)) { - /* package too new (UpgradeDelay) */ - _alpm_log(PM_LOG_WARNING, _("%s-%s: delaying upgrade of package (%s)\n"), - alpm_pkg_get_name(local_pkg), alpm_pkg_get_version(local_pkg), - alpm_pkg_get_version(pkg)); - cmp = 0; - } } return(cmp); @@ -1150,20 +1141,6 @@ pmpkg_t *_alpm_pkg_find(const char *needle, alpm_list_t *haystack) return(NULL); } -/* TODO this should either be public, or done somewhere else */ -int _alpm_pkg_istoonew(pmpkg_t *pkg) -{ - time_t t; - - ALPM_LOG_FUNC; - - if (!handle->upgradedelay) { - return 0; - } - time(&t); - return((pkg->builddate + handle->upgradedelay) > t); -} - /** Test if a package should be ignored. * * Checks if the package is ignored via IgnorePkg, or if the package is -- cgit v1.2.3-24-g4f1b