From 301a46368e33c559850b7087a1052cc3a50618ef Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Mon, 30 Jul 2012 03:08:16 -0500 Subject: [PATCH] Revert "main: --exists should search Requires.private." This reverts commit 980644230de373aadefd59db3e0304dd2ba0daab. --- main.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/main.c b/main.c index e729344..f9bb06d 100644 --- a/main.c +++ b/main.c @@ -43,7 +43,6 @@ #define PKG_LIST (1<<24) #define PKG_HELP (1<<25) #define PKG_PRINT_ERRORS (1<<26) -#define PKG_EXISTS (1<<27) static unsigned int global_traverse_flags = PKGF_NONE; @@ -426,7 +425,7 @@ main(int argc, char *argv[]) { "cflags", no_argument, &want_flags, PKG_CFLAGS|PKG_PRINT_ERRORS, }, { "modversion", no_argument, &want_flags, PKG_MODVERSION|PKG_PRINT_ERRORS, }, { "variable", required_argument, NULL, 7, }, - { "exists", no_argument, &want_flags, PKG_EXISTS, }, + { "exists", no_argument, NULL, 8, }, { "print-errors", no_argument, &want_flags, PKG_PRINT_ERRORS, }, { "short-errors", no_argument, NULL, 10, }, { "maximum-traverse-depth", required_argument, NULL, 11, }, @@ -536,12 +535,6 @@ main(int argc, char *argv[]) if ((want_flags & PKG_STATIC) == PKG_STATIC) global_traverse_flags |= (PKGF_SEARCH_PRIVATE | PKGF_MERGE_PRIVATE_FRAGMENTS); - if ((want_flags & PKG_EXISTS) == PKG_EXISTS) - global_traverse_flags |= (PKGF_SEARCH_PRIVATE); - - if ((want_flags & PKG_CFLAGS) == PKG_CFLAGS) - global_traverse_flags |= (PKGF_SEARCH_PRIVATE); - if ((want_flags & PKG_ENV_ONLY) == PKG_ENV_ONLY) global_traverse_flags |= PKGF_ENV_ONLY;