main: now that we have global_traverse_flags, clean up --static handling

pull/4/head
William Pitcock 2012-05-02 23:20:54 +00:00
parent d97853e49c
commit 84aa1c11f1
1 changed files with 4 additions and 1 deletions

5
main.c
View File

@ -230,7 +230,7 @@ pkg_queue_walk(pkg_queue_t *head)
if (want_libs) if (want_libs)
{ {
wanted_something++; wanted_something++;
pkg_traverse(&world, print_libs, NULL, maximum_traverse_depth, global_traverse_flags | (want_static ? PKGF_SEARCH_PRIVATE : PKGF_NONE)); pkg_traverse(&world, print_libs, NULL, maximum_traverse_depth, global_traverse_flags);
} }
if (want_variable) if (want_variable)
@ -346,7 +346,10 @@ main(int argc, char *argv[])
} }
if (want_static) if (want_static)
{
maximum_traverse_depth++; maximum_traverse_depth++;
global_traverse_flags |= PKGF_SEARCH_PRIVATE;
}
if (want_env_only) if (want_env_only)
global_traverse_flags |= PKGF_ENV_ONLY; global_traverse_flags |= PKGF_ENV_ONLY;