From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e2i632.smtp2go.com (e2i632.smtp2go.com [103.2.142.120]) by sourceware.org (Postfix) with ESMTPS id 42B84386188D for ; Tue, 20 Apr 2021 14:37:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 42B84386188D Received: from [10.139.162.187] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92-S2G) (envelope-from ) id 1lYrV8-qt4DUk-Ba for cygwin-apps@cygwin.com; Tue, 20 Apr 2021 14:37:18 +0000 Received: from [10.62.31.23] (helo=romulus.metastack.com) by smtpcorp.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.92-S2G) (envelope-from ) id 1lYrV8-4XaBLv-2s for cygwin-apps@cygwin.com; Tue, 20 Apr 2021 14:37:18 +0000 Received: from Libera ([172.16.0.125]) (authenticated bits=0) by romulus.metastack.com (8.14.2/8.14.2) with ESMTP id 13KEbHkX013187 for ; Tue, 20 Apr 2021 15:37:17 +0100 From: "David Allsopp" To: Subject: [PATCH setup] Add --allow-test-versions Date: Tue, 20 Apr 2021 15:37:44 +0100 Message-ID: <000001d735f2$b9f5a400$2de0ec00$@cl.cam.ac.uk> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_NextPart_000_0001_01D735FB.1BBC7D00" X-Mailer: Microsoft Outlook 16.0 Thread-Index: Adc18Q+pw3SHSfEmTOq0pl3vPwMfXg== Content-Language: en-gb X-Scanned-By: MIMEDefang 2.65 on 62.31.23.242 X-Smtpcorp-Track: 1_YrV84baULv2s.f_cfd4l5g73Fm Feedback-ID: 614951m:614951apMmpqs:614951sFjdNHnn8d X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Spam-Status: No, score=1.0 required=5.0 tests=BAYES_50, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, HEADER_FROM_DIFFERENT_DOMAINS, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=no autolearn_force=no version=3.4.2 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: cygwin-apps@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin package maintainer discussion list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Apr 2021 14:37:22 -0000 This is a multipart message in MIME format. ------=_NextPart_000_0001_01D735FB.1BBC7D00 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Attached adds -t/--allow-test-packages to Setup which controls the initial state of the "Test" checkbox. Motivation is to allow one CI cron job to be installing test versions of packages, then we can help identify things like [1] before they're released. David [1] https://cygwin.com/pipermail/cygwin/2021-April/248300.html ------=_NextPart_000_0001_01D735FB.1BBC7D00 Content-Type: application/octet-stream; name="0001-Add-allow-test-packages.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-Add-allow-test-packages.patch" >From 8bcb46c490c05158566d2b8a650bdd82ba876aae Mon Sep 17 00:00:00 2001=0A= From: David Allsopp =0A= Date: Tue, 20 Apr 2021 15:23:52 +0100=0A= Subject: [PATCH] Add --allow-test-packages=0A= =0A= ---=0A= choose.cc | 8 ++++++--=0A= 1 file changed, 6 insertions(+), 2 deletions(-)=0A= =0A= diff --git a/choose.cc b/choose.cc=0A= index 4fa0c74..81a5d0d 100644=0A= --- a/choose.cc=0A= +++ b/choose.cc=0A= @@ -63,6 +63,7 @@ static BoolOption UpgradeAlsoOption (false, 'g', = "upgrade-also", "Also upgrade i=0A= static BoolOption CleanOrphansOption (false, 'o', "delete-orphans", = "Remove orphaned packages");=0A= static BoolOption ForceCurrentOption (false, 'f', "force-current", = "Select the current version for all packages");=0A= static BoolOption PruneInstallOption (false, 'Y', "prune-install", = "Prune the installation to only the requested packages");=0A= +static BoolOption AllowTestOption (false, 't', "allow-test-packages", = "Permit installation of package versions marked test");=0A= =0A= extern ThreeBarProgressPage Progress;=0A= =0A= @@ -165,7 +166,7 @@ ChooserPage::initialUpdateState()=0A= if (ForceCurrentOption)=0A= {=0A= update_mode_id =3D IDC_CHOOSE_SYNC;=0A= - changeTrust(update_mode_id, false, true);=0A= + changeTrust(update_mode_id, AllowTestOption, true);=0A= }=0A= else if (hasManualSelections && !UpgradeAlsoOption)=0A= {=0A= @@ -176,7 +177,7 @@ ChooserPage::initialUpdateState()=0A= else=0A= {=0A= update_mode_id =3D IDC_CHOOSE_BEST;=0A= - changeTrust (update_mode_id, false, true);=0A= + changeTrust (update_mode_id, AllowTestOption, true);=0A= }=0A= =0A= static int ta[] =3D { IDC_CHOOSE_KEEP, IDC_CHOOSE_BEST, = IDC_CHOOSE_SYNC, 0 };=0A= @@ -251,6 +252,9 @@ ChooserPage::OnInit ()=0A= {=0A= CheckDlgButton (GetHWND (), IDC_CHOOSE_HIDE, BST_CHECKED);=0A= =0A= + if (AllowTestOption)=0A= + CheckDlgButton (GetHWND (), IDC_CHOOSE_EXP, BST_CHECKED);=0A= +=0A= /* Populate view dropdown list with choices */=0A= HWND viewlist =3D GetDlgItem (IDC_CHOOSE_VIEW);=0A= SendMessage (viewlist, CB_RESETCONTENT, 0, 0);=0A= -- =0A= 2.29.2.windows.2=0A= =0A= ------=_NextPart_000_0001_01D735FB.1BBC7D00--