From 6dd31c6881243f84e02e8d73bbc4f2d8ade3bbb4 Mon Sep 17 00:00:00 2001 From: David Allsopp Date: Tue, 20 Apr 2021 15:23:52 +0100 Subject: [PATCH] Add --allow-test-packages --- choose.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/choose.cc b/choose.cc index 4fa0c74..5411e85 100644 --- a/choose.cc +++ b/choose.cc @@ -63,6 +63,7 @@ static BoolOption UpgradeAlsoOption (false, 'g', "upgrade-also", "Also upgrade i static BoolOption CleanOrphansOption (false, 'o', "delete-orphans", "Remove orphaned packages"); static BoolOption ForceCurrentOption (false, 'f', "force-current", "Select the current version for all packages"); static BoolOption PruneInstallOption (false, 'Y', "prune-install", "Prune the installation to only the requested packages"); +static BoolOption AllowTestOption (false, 't', "allow-test-packages", "Consider package versions marked test"); extern ThreeBarProgressPage Progress; @@ -165,7 +166,7 @@ ChooserPage::initialUpdateState() if (ForceCurrentOption) { update_mode_id = IDC_CHOOSE_SYNC; - changeTrust(update_mode_id, false, true); + changeTrust(update_mode_id, AllowTestOption, true); } else if (hasManualSelections && !UpgradeAlsoOption) { @@ -176,7 +177,7 @@ ChooserPage::initialUpdateState() else { update_mode_id = IDC_CHOOSE_BEST; - changeTrust (update_mode_id, false, true); + changeTrust (update_mode_id, AllowTestOption, true); } static int ta[] = { IDC_CHOOSE_KEEP, IDC_CHOOSE_BEST, IDC_CHOOSE_SYNC, 0 }; @@ -251,6 +252,9 @@ ChooserPage::OnInit () { CheckDlgButton (GetHWND (), IDC_CHOOSE_HIDE, BST_CHECKED); + if (AllowTestOption) + CheckDlgButton (GetHWND (), IDC_CHOOSE_EXP, BST_CHECKED); + /* Populate view dropdown list with choices */ HWND viewlist = GetDlgItem (IDC_CHOOSE_VIEW); SendMessage (viewlist, CB_RESETCONTENT, 0, 0); -- 2.29.2.windows.2