diff options
| author | Dan McGee <dan@archlinux.org> | 2011-01-22 10:03:51 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-01-22 10:03:51 -0600 |
| commit | 51175f31c4aac9df6ceeffc7855a0f842c580fdb (patch) | |
| tree | 4fe5405a24aa967572f407dafbbee9231a25b0dc /lib/libalpm/package.c | |
| parent | e277e838d798c1463ae5df98dcf637df70e048ec (diff) | |
| parent | 859bdb5b1d1b9ccb781c95026836283a005a96ce (diff) | |
| download | pacman-51175f31c4aac9df6ceeffc7855a0f842c580fdb.tar.xz | |
Merge branch 'epoch-work'
Diffstat (limited to 'lib/libalpm/package.c')
| -rw-r--r-- | lib/libalpm/package.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/libalpm/package.c b/lib/libalpm/package.c index 241c41c0..d4b3b9c0 100644 --- a/lib/libalpm/package.c +++ b/lib/libalpm/package.c @@ -110,7 +110,6 @@ static const char *_pkg_get_arch(pmpkg_t *pkg) { return pkg->arch; } static off_t _pkg_get_size(pmpkg_t *pkg) { return pkg->size; } static off_t _pkg_get_isize(pmpkg_t *pkg) { return pkg->isize; } static pmpkgreason_t _pkg_get_reason(pmpkg_t *pkg) { return pkg->reason; } -static int _pkg_get_epoch(pmpkg_t *pkg) { return pkg->epoch; } static int _pkg_has_scriptlet(pmpkg_t *pkg) { return pkg->scriptlet; } static alpm_list_t *_pkg_get_licenses(pmpkg_t *pkg) { return pkg->licenses; } @@ -141,7 +140,6 @@ struct pkg_operations default_pkg_ops = { .get_size = _pkg_get_size, .get_isize = _pkg_get_isize, .get_reason = _pkg_get_reason, - .get_epoch = _pkg_get_epoch, .has_scriptlet = _pkg_has_scriptlet, .get_licenses = _pkg_get_licenses, .get_groups = _pkg_get_groups, @@ -223,11 +221,6 @@ pmpkgreason_t SYMEXPORT alpm_pkg_get_reason(pmpkg_t *pkg) return pkg->ops->get_reason(pkg); } -int SYMEXPORT alpm_pkg_get_epoch(pmpkg_t *pkg) -{ - return pkg->ops->get_epoch(pkg); -} - alpm_list_t SYMEXPORT *alpm_pkg_get_licenses(pmpkg_t *pkg) { return pkg->ops->get_licenses(pkg); @@ -427,7 +420,6 @@ pmpkg_t *_alpm_pkg_dup(pmpkg_t *pkg) newpkg->size = pkg->size; newpkg->isize = pkg->isize; newpkg->scriptlet = pkg->scriptlet; - newpkg->epoch = pkg->epoch; newpkg->reason = pkg->reason; newpkg->licenses = alpm_list_strdup(pkg->licenses); @@ -518,20 +510,8 @@ void _alpm_pkg_free_trans(pmpkg_t *pkg) /* Is spkg an upgrade for localpkg? */ int _alpm_pkg_compare_versions(pmpkg_t *spkg, pmpkg_t *localpkg) { - int spkg_epoch, localpkg_epoch; - ALPM_LOG_FUNC; - spkg_epoch = alpm_pkg_get_epoch(spkg); - localpkg_epoch = alpm_pkg_get_epoch(localpkg); - - if(spkg_epoch > localpkg_epoch) { - return(1); - } else if(spkg_epoch < localpkg_epoch) { - return(-1); - } - - /* equal epoch values, move on to version comparison */ return alpm_pkg_vercmp(alpm_pkg_get_version(spkg), alpm_pkg_get_version(localpkg)); } |