index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Dan McGee <dan@archlinux.org> | 2008-01-08 15:49:52 -0600 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2008-01-08 15:49:52 -0600 |
commit | 9dd016001eafb69991661d4d8bda91906d51ed78 (patch) | |
tree | bbe1bf67880aa689d3b300db735fb4fa72adb24e /lib/libalpm/package.c | |
parent | a24c323abadd7802a38d162a0015bbc4dc82f75d (diff) |
-rw-r--r-- | lib/libalpm/package.c | 23 |
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 |