summaryrefslogtreecommitdiff
path: root/lib/libalpm
diff options
context:
space:
mode:
authorAurelien Foret <aurelien@archlinux.org>2005-04-24 20:06:00 +0000
committerAurelien Foret <aurelien@archlinux.org>2005-04-24 20:06:00 +0000
commit90b9888d3ac6592cd6127011687142f29a882a47 (patch)
treed3ffb4ce6ef0210784615d507bddf4f1c01933b1 /lib/libalpm
parent11bf5f8b654df2996bff3f01925bbbc8eccfa76a (diff)
got ride of an ORE tag in resolvedeps()
Diffstat (limited to 'lib/libalpm')
-rw-r--r--lib/libalpm/deps.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libalpm/deps.c b/lib/libalpm/deps.c
index a543277a..2f5d1457 100644
--- a/lib/libalpm/deps.c
+++ b/lib/libalpm/deps.c
@@ -33,6 +33,9 @@
#include "provide.h"
#include "deps.h"
#include "rpmvercmp.h"
+#include "handle.h"
+
+extern pmhandle_t *handle;
/* Re-order a list of target packages with respect to their dependencies.
*
@@ -628,17 +631,11 @@ int resolvedeps(pmdb_t *local, PMList *dbs_sync, pmpkg_t *syncpkg, PMList *list,
*/
int usedep = 1;
found = 0;
- /* ORE
for(j = handle->ignorepkg; j && !found; j = j->next) {
if(!strcmp(j->data, sync->name)) {
found = 1;
}
}
- for(j = pmo_s_ignore; j && !found; j = j->next) {
- if(!strcmp(j->data, sync->pkg->name)) {
- found = 1;
- }
- }*/
if(found) {
/* ORE
usedep = yesno("%s requires %s, but it is in IgnorePkg. Install anyway? [Y/n] ",