diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2007-11-16 22:37:57 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-19 03:05:51 +0100 |
| commit | 84ebf8231985ff285f7995cd7ecaceb750a3c78b (patch) | |
| tree | d42dd444a5b0e70d39a7a69de469fdef9111ac25 /lib/libalpm/sync.c | |
| parent | 23b4e0270b1a1881b2daf362a398a3bdc20fab43 (diff) | |
| download | pacman-84ebf8231985ff285f7995cd7ecaceb750a3c78b.tar.gz pacman-84ebf8231985ff285f7995cd7ecaceb750a3c78b.tar.xz | |
Versioned provisions.
This patch introduces versioned provisions in "provision 1.0-1" format.
_alpm_db_whatprovides was modified accordingly (added sync500.py),
alpm_depcmp was modified accordingly (add043.py passes now; added add044.py
and add045.py).
Notes:
alpm_db_search now uses the whole versioned %PROVIDES% string in its search.
debug logging was simplified in alpm_depcmp.
Signed-off-by: Nagy Gabor <ngaba@bibl.u-szeged.hu>
[Xavier: fixed a few typos, duplicate const strings with strdup before
modifying them, put some debugging back in alpm_depcmp, minor code cleanups
(var/function renaming), added a note in PKGBUILD man page.]
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
[Dan: made strcmp checks clearer, added a comment]
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'lib/libalpm/sync.c')
| -rw-r--r-- | lib/libalpm/sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index e4a7799e..b13a0943 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -492,8 +492,8 @@ int _alpm_sync_prepare(pmtrans_t *trans, pmdb_t *db_local, alpm_list_t *dbs_sync } pmpkg_t *local = _alpm_db_get_pkgfromcache(db_local, conflict->package2); /* check if this package provides the package it's conflicting with */ - if(alpm_list_find_str(alpm_pkg_get_provides(sync->pkg), - conflict->package2)) { + if(alpm_list_find(alpm_pkg_get_provides(sync->pkg), + conflict->package2, _alpm_prov_cmp)) { /* treat like a replaces item so requiredby fields are * inherited properly. */ _alpm_log(PM_LOG_DEBUG, "package '%s' provides its own conflict\n", |