summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAaron Griffin <aaron@archlinux.org>2007-03-19 04:23:45 +0000
committerAaron Griffin <aaron@archlinux.org>2007-03-19 04:23:45 +0000
commitbd55cf548c63958e6d4e8c15ccd5bed3972e0574 (patch)
tree41cf89dc9d7b0f25ebfb1a3afeb5d4807ee55aca /lib
parentcf6f184243a230b8f0b775269ced06a239827bd1 (diff)
downloadpacman-bd55cf548c63958e6d4e8c15ccd5bed3972e0574.tar.xz
James Rosten <seinfeld90@gmail.com>
* Two new pactest test cases * Fix some "required by" / "requires" output by unifying all "dependency types" to a single value (PM_DEP_TYPE_DEPEND)
Diffstat (limited to 'lib')
-rw-r--r--lib/libalpm/alpm.h1
-rw-r--r--lib/libalpm/deps.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 366aeda3..fc4aed59 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -371,7 +371,6 @@ typedef enum _pmdepmod_t {
typedef enum _pmdeptype_t {
PM_DEP_TYPE_DEPEND = 1,
- PM_DEP_TYPE_REQUIRED,
PM_DEP_TYPE_CONFLICT
} pmdeptype_t;
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index 55097ed0..137be645 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -288,7 +288,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
if(!satisfied) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: updated '%s' won't satisfy a dependency of '%s'"),
alpm_pkg_get_name(oldpkg), alpm_pkg_get_name(p));
- miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_REQUIRED, depend->mod,
+ miss = _alpm_depmiss_new(p->name, PM_DEP_TYPE_DEPEND, depend->mod,
depend->name, depend->version);
if(!_alpm_depmiss_isin(miss, baddeps)) {
baddeps = alpm_list_add(baddeps, miss);
@@ -408,7 +408,7 @@ alpm_list_t *_alpm_checkdeps(pmtrans_t *trans, pmdb_t *db, pmtranstype_t op,
if(!found) {
_alpm_log(PM_LOG_DEBUG, _("checkdeps: found %s as required by %s"),
reqname, alpm_pkg_get_name(tp));
- miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_REQUIRED,
+ miss = _alpm_depmiss_new(alpm_pkg_get_name(tp), PM_DEP_TYPE_DEPEND,
PM_DEP_MOD_ANY, j->data, NULL);
if(!_alpm_depmiss_isin(miss, baddeps)) {
baddeps = alpm_list_add(baddeps, miss);