From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <jturney@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2201)
 id 77143383F876; Sun, 28 Jun 2020 13:36:42 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 77143383F876
To: cygwin-apps-cvs@sourceware.org
Subject: [setup - the official Cygwin setup program] branch master,
 updated. release_2.905
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 06eaabde8f6df48180b8570f043d31005d5b9036
X-Git-Newrev: 30d0e66065db65f566c9372c53c5e85edc76bf6a
Message-Id: <20200628133642.77143383F876@sourceware.org>
Date: Sun, 28 Jun 2020 13:36:42 +0000 (GMT)
From: Jon TURNEY <jturney@sourceware.org>
X-BeenThere: cygwin-apps-cvs@cygwin.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Cygwin-apps git logs <cygwin-apps-cvs.cygwin.com>
List-Unsubscribe: <http://cygwin.com/mailman/options/cygwin-apps-cvs>,
 <mailto:cygwin-apps-cvs-request@cygwin.com?subject=unsubscribe>
List-Archive: <https://cygwin.com/pipermail/cygwin-apps-cvs/>
List-Help: <mailto:cygwin-apps-cvs-request@cygwin.com?subject=help>
List-Subscribe: <http://cygwin.com/mailman/listinfo/cygwin-apps-cvs>,
 <mailto:cygwin-apps-cvs-request@cygwin.com?subject=subscribe>
X-List-Received-Date: Sun, 28 Jun 2020 13:36:42 -0000




https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=30d0e66065db65f566c9372c53c5e85edc76bf6a

commit 30d0e66065db65f566c9372c53c5e85edc76bf6a
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sat Jun 27 16:10:57 2020 +0100

    Properly record user_picked again
    
    Properly record user_picked again, which was broken by changes in 2.895


Diff:
---
 package_meta.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package_meta.cc b/package_meta.cc
index 121fc70d..61b7620b 100644
--- a/package_meta.cc
+++ b/package_meta.cc
@@ -455,7 +455,7 @@ packagemeta::select_action (int id, trusts const deftrust)
       for (int j = -id; j > 0; j--)
         i++;
 
-      set_action(Install_action, *i);
+      set_action(Install_action, *i, true);
     }
   else
     {
@@ -483,7 +483,7 @@ packagemeta::toggle_action ()
         if (!packagedb::solver.is_test_package(*i))
           naively_preferred = *i;
 
-      set_action(Install_action, naively_preferred);
+      set_action(Install_action, naively_preferred, true);
     }
 }