diff options
| -rw-r--r-- | bpkg/pkg-drop.cli | 7 | ||||
| -rw-r--r-- | bpkg/pkg-drop.cxx | 53 | ||||
| -rw-r--r-- | tests/pkg-drop.testscript | 7 |
3 files changed, 47 insertions, 20 deletions
diff --git a/bpkg/pkg-drop.cli b/bpkg/pkg-drop.cli index 7c2b0bd..75ee04d 100644 --- a/bpkg/pkg-drop.cli +++ b/bpkg/pkg-drop.cli @@ -81,6 +81,13 @@ namespace bpkg "Issue an error if attempting to drop dependent packages." } + uint16_t --dependent-exit + { + "<code>", + "Silently exit with the specified error code if attempting to drop + dependent packages." + } + bool --disfigure-only { "Disfigure all the packages but don't purge." diff --git a/bpkg/pkg-drop.cxx b/bpkg/pkg-drop.cxx index 7def795..d8fa4ea 100644 --- a/bpkg/pkg-drop.cxx +++ b/bpkg/pkg-drop.cxx @@ -51,23 +51,23 @@ namespace bpkg }; using dependent_names = vector<dependent_name>; - // A "dependency-ordered" list of packages and their prerequisites. - // That is, every package on the list only possibly depending on the - // ones after it. In a nutshell, the usage is as follows: we first add - // the packages specified by the user (the "user selection"). We then - // collect all the dependent packages of the user selection, if any. - // These will either have to be dropped as well or we cannot continue. - // If the user gave the go ahead to drop the dependents, then, for our - // purposes, this list of dependents can from now own be treated as if - // it was a part of the user selection. The next step is to collect all - // the non-held prerequisites of the user selection with the goal of - // figuring out which ones will no longer be needed and offering to - // drop them as well. This part is a bit tricky and has to be done in - // three steps: We first collect all the prerequisites that we could - // possibly be dropping. We then order all the packages. And, finally, - // we filter out prerequisites that we cannot drop. See the comment to - // the call to collect_prerequisites() for details on why it has to be - // done this way. + // A "dependency-ordered" list of packages and their prerequisites. That is, + // every package on the list only possibly depending on the ones after it. + // In a nutshell, the usage is as follows: we first add the packages + // specified by the user (the "user selection"). We then collect all the + // dependent packages of the user selection, if any. These will either have + // to be dropped as well or we cannot continue and need to either issue + // diagnostics and fail or exit with the specified (via --dependent-exit) + // code. If the user gave the go ahead to drop the dependents, then, for our + // purposes, this list of dependents can from now own be treated as if it + // was a part of the user selection. The next step is to collect all the + // non-held prerequisites of the user selection with the goal of figuring + // out which ones will no longer be needed and offering to drop them as + // well. This part is a bit tricky and has to be done in three steps: We + // first collect all the prerequisites that we could possibly be dropping. + // We then order all the packages. And, finally, we filter out prerequisites + // that we cannot drop. See the comment to the call to + // collect_prerequisites() for details on why it has to be done this way. // struct drop_packages: list<reference_wrapper<drop_package>> { @@ -520,6 +520,16 @@ namespace bpkg dr << fail << "both --drop-dependent and --keep-dependent|-K " << "specified"; } + else if (o.drop_dependent () && o.dependent_exit_specified ()) + { + dr << fail << "both --drop-dependent and --dependent-exit " + << "specified"; + } + else if (o.keep_dependent () && o.dependent_exit_specified ()) + { + dr << fail << "both --keep-dependent|-K and --dependent-exit " + << "specified"; + } else if (o.all ()) { if (o.all_pattern_specified ()) @@ -632,11 +642,18 @@ namespace bpkg // The next step is to see if there are any dependents that are not // already on the list. We will either have to drop those as well or - // abort. + // issue diagnostics and fail or silently indicate that with an exit + // code. // dependent_names dnames (pkgs.collect_dependents ()); if (!dnames.empty () && !o.drop_dependent ()) { + if (o.dependent_exit_specified ()) + { + t.commit (); + return o.dependent_exit (); + } + { diag_record dr; diff --git a/tests/pkg-drop.testscript b/tests/pkg-drop.testscript index 7504d6c..a3c48ab 100644 --- a/tests/pkg-drop.testscript +++ b/tests/pkg-drop.testscript @@ -386,12 +386,13 @@ $* libfoo/1.0.0 2>>~%EOE% != 0 : keep-drop-options : -: Test --drop-dependent, --keep-dependent, --keep-unused, option. +: Test --drop-dependent, --keep-dependent, --dependent-exit, --keep-unused +: options. : { +$clone_cfg && $rep_add $rep/t4b && $rep_fetch - : keep-drop-dependent + : keep-exit-drop-dependent : { $clone_cfg && $pkg_build libbar; @@ -401,6 +402,8 @@ $* libfoo/1.0.0 2>>~%EOE% != 0 libbar (requires libfoo) EOE + $* --dependent-exit 100 libfoo == 100; + $* --drop-dependent libfoo 2>>EOE disfigured libbar disfigured libfoo |