diff options
| author | Nagy Gabor <ngaba@bibl.u-szeged.hu> | 2007-11-18 14:25:43 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-11-18 12:42:39 -0600 |
| commit | 2aa7e69da91c1d7a18473cf05df98c92bd1dc747 (patch) | |
| tree | 1bec8c7ecd1fa012522d2bc311ecefb0f45e1d3b /lib/libalpm/deps.h | |
| parent | 65fb99133df10143e07c237f04777e01b443c037 (diff) | |
| download | pacman-2aa7e69da91c1d7a18473cf05df98c92bd1dc747.tar.xz | |
Add the pmconflict_t type.
pmdepmissing_t was used for two totally different things :
missing dependencies, and dependency conflicts.
So this patch simply adds a type for dep conflicts,
and convert the code to use it.
This fix the TODO in conflict.c :
/* TODO WTF is a 'depmissing' doing indicating a conflict? */
Additionally, the code in conflict.c now eliminates the duplicated conflicts.
If pkg1 conflicts with pkg2, and pkg2 conflicts with pkg1, only one of them will be stored.
However the conflict handling in sync_prepare (sync.c) is still very asymetrical, and very ugly too.
This should be improved in the future (there is already a pending patch from Nagy that cleans it a lot).
Signed-off-by: Chantry Xavier <shiningxc@gmail.com>
Diffstat (limited to 'lib/libalpm/deps.h')
| -rw-r--r-- | lib/libalpm/deps.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/libalpm/deps.h b/lib/libalpm/deps.h index 1d656910..a736f705 100644 --- a/lib/libalpm/deps.h +++ b/lib/libalpm/deps.h @@ -38,7 +38,6 @@ struct __pmdepend_t { /* Missing dependency */ struct __pmdepmissing_t { char target[PKG_NAME_LEN]; - pmdeptype_t type; pmdepend_t depend; }; @@ -51,9 +50,8 @@ struct __pmgraph_t { alpm_list_t *childptr; /* points to a child in children list */ }; -pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdeptype_t type, - pmdepmod_t depmod, const char *depname, - const char *depversion); +pmdepmissing_t *_alpm_depmiss_new(const char *target, pmdepmod_t depmod, + const char *depname, const char *depversion); int _alpm_depmiss_isin(pmdepmissing_t *needle, alpm_list_t *haystack); alpm_list_t *_alpm_sortbydeps(alpm_list_t *targets, pmtranstype_t mode); alpm_list_t *_alpm_checkdeps(pmdb_t *db, pmtranstype_t op, |