diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-03-28 09:46:20 +0200 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2018-04-19 19:39:55 +0300 |
| commit | 541b40803751d4dc6b6575e3f80de89b04b71bc6 (patch) | |
| tree | c98616d5f8a5620329339bf4a86e886b1cebfa6c /bpkg/pkg-drop.cxx | |
| parent | 93d95938306e76a0f8b9422ea6b3cb4695610f73 (diff) | |
Replace --{drop,keep}-prerequisites with --keep-unused
Diffstat (limited to 'bpkg/pkg-drop.cxx')
| -rw-r--r-- | bpkg/pkg-drop.cxx | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/bpkg/pkg-drop.cxx b/bpkg/pkg-drop.cxx index 0127fb6..2ba4b72 100644 --- a/bpkg/pkg-drop.cxx +++ b/bpkg/pkg-drop.cxx @@ -417,11 +417,6 @@ namespace bpkg << "specified" << info << "run 'bpkg help pkg-drop' for more information"; - if (o.drop_prerequisite () && o.keep_prerequisite ()) - fail << "both --drop-prerequisite|-D and --keep-prerequisite " - << "specified" << - info << "run 'bpkg help pkg-drop' for more information"; - if (!args.more ()) fail << "package name argument expected" << info << "run 'bpkg help pkg-drop' for more information"; @@ -537,15 +532,14 @@ namespace bpkg // some that we can drop, ask the user for confirmation. // if (pkgs.filter_prerequisites (db) && - !o.keep_prerequisite () && - !(drop_prq = o.drop_prerequisite ()) && + !o.keep_unused () && !(drop_prq = o.yes ()) && !o.no ()) { { diag_record dr (text); - dr << "following prerequisite packages were automatically " - << "built and will no longer be necessary:"; + dr << "following dependencies were automatically built but will " + << "no longer be used:"; for (const drop_package& dp: pkgs) { @@ -555,7 +549,7 @@ namespace bpkg } } - drop_prq = yn_prompt ("drop prerequisite packages? [Y/n]", 'y'); + drop_prq = yn_prompt ("drop unused packages? [Y/n]", 'y'); if (drop_prq) print_plan = true; @@ -623,14 +617,14 @@ namespace bpkg { diag_record dr (text); - dr << "following prerequisite packages were automatically " - << "built and will no longer be necessary:"; + dr << "following dependencies were automatically built but will " + << "no longer be used:"; for (const drop_package& dp: pkgs) dr << text << dp.package->name; } - if (!yn_prompt ("drop prerequisite packages? [Y/n]", 'y')) + if (!yn_prompt ("drop unused packages? [Y/n]", 'y')) return {}; } |