From d1230c2e259ebdf892c7979fce041d84984ddb74 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 3 Dec 2020 08:31:40 +0100 Subject: Remove the idea of "system dependencies" Because we want to be able to work on different distros, we cannot have a concept of "system dependencies", because each distro names their packages differently. The concept of installing stuff from a distro image can still be accomplished easily via environment variables. Signed-off-by: Matthias Beyer --- src/commands/dependencies_of.rs | 12 +++--------- src/commands/find_pkg.rs | 2 -- src/commands/what_depends.rs | 8 +------- 3 files changed, 4 insertions(+), 18 deletions(-) (limited to 'src/commands') diff --git a/src/commands/dependencies_of.rs b/src/commands/dependencies_of.rs index 1addb94..355b41f 100644 --- a/src/commands/dependencies_of.rs +++ b/src/commands/dependencies_of.rs @@ -23,22 +23,16 @@ pub async fn dependencies_of<'a>(matches: &ArgMatches, config: &Configuration<'a let print_runtime_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_RUNTIME); let print_build_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_BUILD); - let print_sys_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_SYSTEM); - let print_sys_runtime_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_SYSTEM_RUNTIME); - trace!("Printing packages with format = '{}', runtime: {}, build: {}, sys: {}, sys_rt: {}", + trace!("Printing packages with format = '{}', runtime: {}, build: {}", format, print_runtime_deps, - print_build_deps, - print_sys_deps, - print_sys_runtime_deps); + print_build_deps); crate::ui::print_packages(&mut stdout, format, iter, print_runtime_deps, - print_build_deps, - print_sys_deps, - print_sys_runtime_deps) + print_build_deps) } diff --git a/src/commands/find_pkg.rs b/src/commands/find_pkg.rs index b6c26a5..be35d43 100644 --- a/src/commands/find_pkg.rs +++ b/src/commands/find_pkg.rs @@ -43,8 +43,6 @@ pub async fn find_pkg<'a>(matches: &ArgMatches, config: &Configuration<'a>, repo format, iter, true, - true, - true, true) } } diff --git a/src/commands/what_depends.rs b/src/commands/what_depends.rs index 268b543..fc2c125 100644 --- a/src/commands/what_depends.rs +++ b/src/commands/what_depends.rs @@ -13,16 +13,12 @@ pub async fn what_depends<'a>(matches: &ArgMatches, config: &Configuration<'a>, let print_runtime_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_RUNTIME); let print_build_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_BUILD); - let print_sys_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_SYSTEM); - let print_sys_runtime_deps = getbool(matches, "dependency_type", crate::cli::IDENT_DEPENDENCY_TYPE_SYSTEM_RUNTIME); let package_filter = { let name = matches.value_of("package_name").map(String::from).map(PackageName::from).unwrap(); crate::util::filters::build_package_filter_by_dependency_name( &name, - print_sys_deps, - print_sys_runtime_deps, print_build_deps, print_runtime_deps ) @@ -42,8 +38,6 @@ pub async fn what_depends<'a>(matches: &ArgMatches, config: &Configuration<'a>, format, packages.into_iter(), print_runtime_deps, - print_build_deps, - print_sys_deps, - print_sys_runtime_deps) + print_build_deps) } -- cgit v1.2.3