From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 57200 invoked by alias); 30 Aug 2017 21:47:58 -0000 Mailing-List: contact cygwin-apps-help@cygwin.com; run by ezmlm Precedence: bulk Sender: cygwin-apps-owner@cygwin.com List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Mail-Followup-To: cygwin-apps@cygwin.com Received: (qmail 57187 invoked by uid 89); 30 Aug 2017 21:47:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=symptom, our X-HELO: limerock01.mail.cornell.edu Received: from limerock01.mail.cornell.edu (HELO limerock01.mail.cornell.edu) (128.84.13.241) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 30 Aug 2017 21:47:47 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite4.serverfarm.cornell.edu [10.16.197.9]) by limerock01.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id v7ULljEC025728 for ; Wed, 30 Aug 2017 17:47:45 -0400 Received: from [192.168.0.15] (mta-68-175-129-7.twcny.rr.com [68.175.129.7] (may be forged)) (authenticated bits=0) by authusersmtp.mail.cornell.edu (8.14.4/8.12.10) with ESMTP id v7ULliSP007905 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Wed, 30 Aug 2017 17:47:45 -0400 Subject: Re: [PATCH setup 00/14] Use libsolv, solve all our problems... (WIP) To: cygwin-apps@cygwin.com References: <20170531105015.162228-1-jon.turney@dronecode.org.uk> From: Ken Brown Message-ID: <8a919cd0-a36a-7b42-4e02-ded7f00ac8f5@cornell.edu> Date: Wed, 30 Aug 2017 21:47:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------BA2BD0182B3AD89D6D772B18" X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-08/txt/msg00032.txt.bz2 This is a multi-part message in MIME format. --------------BA2BD0182B3AD89D6D772B18 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-length: 1391 On 8/29/2017 9:37 AM, Ken Brown wrote: > On 5/31/2017 6:50 AM, Jon Turney wrote: >> ... solve some problems, perhaps add some new ones, I guess.  I'm not >> 100% >> sure this is the right approach to take, but I wrote it, so here it is. > [...] >> - As implemented, selecting "Current" overrides "Keep".  This is >> wrong, and a >> change from current behaviour, but is probably a symptom of some deeper >> confusion in the picker UI I'm not sure how to address > > I think the problem might be the following lines in the definition of > SolverSolution::update: > >   if (update) >     queue_push2(&job, SOLVER_UPDATE | SOLVER_SOLVABLE_ALL, 0); > > When the prerequisite checker calls SolverSolution::update, doesn't this > cause the upgrading of old versions that we want to keep (assuming > "Current" has been selected)?  As a quick test, I commented out those > lines and found that setup.exe let me keep an old version of a package. > > Maybe you need to add a DISABLE_UPDATE command to the solver task list > to implement "Keep" for packages that would otherwise be updated. DISABLE_UPDATE is not a command. But SOLVER_LOCK seems to do the job. Jon, I'm attaching a patch that should apply to the libsolv branch of your github cygwin-setup repo. So far I've only tested it very lightly, enough to verify that it lets me keep an old version of a package. Ken --------------BA2BD0182B3AD89D6D772B18 Content-Type: text/plain; charset=UTF-8; name="0001-Don-t-override-a-Keep-selection.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Don-t-override-a-Keep-selection.patch" Content-length: 4388 RnJvbSAyNjIzMWQzYzgzYzM5MmU2ZmEyNjdiY2VhOTEzNWYyYjVlNWFmMWNh IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLZW4gQnJvd24gPGti cm93bkBjb3JuZWxsLmVkdT4KRGF0ZTogV2VkLCAzMCBBdWcgMjAxNyAxNzoz NjoxMyAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIERvbid0IG92ZXJyaWRlIGEg S2VlcCBzZWxlY3Rpb24KCi0tLQogbGlic29sdi5jYyAgICAgfCAgMyArKysK IGxpYnNvbHYuaCAgICAgIHwgIDMgKystCiBwYWNrYWdlX2RiLmNjICB8ICAy ICstCiBwYWNrYWdlX21ldGEuaCB8ICAyICsrCiBwcmVyZXEuY2MgICAgICB8 IDEyICsrKysrKysrLS0tLQogNSBmaWxlcyBjaGFuZ2VkLCAxNiBpbnNlcnRp b25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xpYnNvbHYu Y2MgYi9saWJzb2x2LmNjCmluZGV4IGY1MDk2MTcuLjY3Yjk5YjIgMTAwNjQ0 Ci0tLSBhL2xpYnNvbHYuY2MKKysrIGIvbGlic29sdi5jYwpAQCAtNTI2LDYg KzUyNiw5IEBAIFNvbHZlclNvbHV0aW9uOjp1cGRhdGUoU29sdmVyVGFza3Mg JnRhc2tzLCBib29sIHVwZGF0ZSwgYm9vbCB1c2VfdGVzdF9wYWNrYWdlcywK ICAgICAgICAgICAvLyB3ZSBkb24ndCBrbm93IGhvdyB0byBhc2sgc29sdmVy IGZvciB0aGlzLCBzbyB3ZSBqdXN0IGFkZCB0aGUgZXJhc2UKICAgICAgICAg ICAvLyBhbmQgaW5zdGFsbCBsYXRlcgogICAgICAgICAgIGJyZWFrOworCWNh c2UgU29sdmVyVGFza3M6OnRhc2tLZWVwOgorCSAgcXVldWVfcHVzaDIoJmpv YiwgU09MVkVSX0xPQ0sgfCBTT0xWRVJfU09MVkFCTEUsIHN2LmlkKTsKKwkg IGJyZWFrOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgIExvZyAoTE9H X1BMQUlOKSA8PCAidW5rbm93biB0YXNrICIgPDwgKCppKS5zZWNvbmQgPDwg ZW5kTG9nOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9saWJzb2x2LmggYi9s aWJzb2x2LmgKaW5kZXggYmU1MThlOS4uNzc2ODEyOCAxMDA2NDQKLS0tIGEv bGlic29sdi5oCisrKyBiL2xpYnNvbHYuaApAQCAtMTY1LDcgKzE2NSw4IEBA IGNsYXNzIFNvbHZlclRhc2tzCiAgIHsKICAgICB0YXNrSW5zdGFsbCwKICAg ICB0YXNrVW5pbnN0YWxsLAotICAgIHRhc2tSZWluc3RhbGwKKyAgICB0YXNr UmVpbnN0YWxsLAorICAgIHRhc2tLZWVwLAogICB9OwogICB2b2lkIGFkZChj b25zdCBTb2x2YWJsZVZlcnNpb24gJnYsIHRhc2sgdCkKICAgewpkaWZmIC0t Z2l0IGEvcGFja2FnZV9kYi5jYyBiL3BhY2thZ2VfZGIuY2MKaW5kZXggOWY5 ZTBhNi4uZDdlYzA0MyAxMDA2NDQKLS0tIGEvcGFja2FnZV9kYi5jYworKysg Yi9wYWNrYWdlX2RiLmNjCkBAIC01MjIsNyArNTIyLDcgQEAgcGFja2FnZWRi OjpkZWZhdWx0VHJ1c3QgKHRydXN0cyB0cnVzdCkKICAgICAgICAgICAgIHx8 IHBrZy5jYXRlZ29yaWVzLmZpbmQgKCJCYXNlIikgIT0gcGtnLmNhdGVnb3Jp ZXMuZW5kICgpCiAgICAgICAgICAgICB8fCBwa2cuY2F0ZWdvcmllcy5maW5k ICgiT3JwaGFuZWQiKSAhPSBwa2cuY2F0ZWdvcmllcy5lbmQgKCkpCiAgICAg ICAgIHsKLSAgICAgICAgICBwa2cuZGVzaXJlZCA9IHBrZy50cnVzdHAgKHRy dWUsIHRydXN0KTsKKyAgICAgICAgICBwa2cuZGVzaXJlZCA9IHBrZy5kZWZh dWx0X3ZlcnNpb24gPSBwa2cudHJ1c3RwICh0cnVlLCB0cnVzdCk7CiAgICAg ICAgICAgaWYgKHBrZy5kZXNpcmVkKQogICAgICAgICAgICAgcGtnLnBpY2sg KHBrZy5kZXNpcmVkLmFjY2Vzc2libGUoKSAmJiBwa2cuZGVzaXJlZCAhPSBw a2cuaW5zdGFsbGVkKTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvcGFja2Fn ZV9tZXRhLmggYi9wYWNrYWdlX21ldGEuaAppbmRleCBiNmZhYWI4Li5kOTFm N2M5IDEwMDY0NAotLS0gYS9wYWNrYWdlX21ldGEuaAorKysgYi9wYWNrYWdl X21ldGEuaApAQCAtMTMxLDYgKzEzMSw4IEBAIHB1YmxpYzoKICAgcGFja2Fn ZXZlcnNpb24gY3VycjsKICAgLyogZGl0dG8gZm9yICJ0ZXN0IiAoZXhwZXJp bWVudGFsKSAqLwogICBwYWNrYWdldmVyc2lvbiBleHA7CisgIC8qIHdoaWNo IG9uZSBpcyB0aGUgZGVmYXVsdCBhY2NvcmRpbmcgdG8gdGhlIGNob29zZXIg Z2xvYmFsIHN0YXRlICovCisgIHBhY2thZ2V2ZXJzaW9uIGRlZmF1bHRfdmVy c2lvbjsKICAgLyogTm93IGZvciB0aGUgdXNlciBzdHVmZiA6XSAqLwogICAv KiBXaGF0IHZlcnNpb24gZG9lcyB0aGUgdXNlciB3YW50ID8gKi8KICAgcGFj a2FnZXZlcnNpb24gZGVzaXJlZDsKZGlmZiAtLWdpdCBhL3ByZXJlcS5jYyBi L3ByZXJlcS5jYwppbmRleCA0OWZiZDc3Li44OTIyY2M2IDEwMDY0NAotLS0g YS9wcmVyZXEuY2MKKysrIGIvcHJlcmVxLmNjCkBAIC0xNzAsNiArMTcwLDcg QEAgUHJlcmVxQ2hlY2tlcjo6aXNNZXQgKCkKIAogICAgICAgLy8gZGVjb2Rl IFVJIHN0YXRlIHRvIGFjdGlvbgogICAgICAgLy8gc2tpcCBhbmQga2VlcCBk b24ndCBjaGFuZ2UgZGVwZW5kZW5jeSBzb2x1dGlvbgorICAgICAgLy8gZXhj ZXB0IHdoZW4gd2Ugd2FudCB0byBrZWVwIGFuIG9sZCB2ZXJzaW9uCiAgICAg ICBpZiAocGtnLT5pbnN0YWxsZWQgIT0gcGtnLT5kZXNpcmVkKQogICAgICAg ICB7CiAgICAgICAgICAgaWYgKHBrZy0+ZGVzaXJlZCkKQEAgLTE3NywxMCAr MTc4LDEzIEBAIFByZXJlcUNoZWNrZXI6OmlzTWV0ICgpCiAgICAgICAgICAg ZWxzZQogICAgICAgICAgICAgcS5hZGQocGtnLT5pbnN0YWxsZWQsIFNvbHZl clRhc2tzOjp0YXNrVW5pbnN0YWxsKTsgLy8gdW5pbnN0YWxsCiAgICAgICAg IH0KLSAgICAgIGVsc2UKLSAgICAgICAgaWYgKHBrZy0+cGlja2VkKCkpCi0g ICAgICAgICAgcS5hZGQocGtnLT5pbnN0YWxsZWQsIFNvbHZlclRhc2tzOjp0 YXNrUmVpbnN0YWxsKTsgLy8gcmVpbnN0YWxsCi0KKyAgICAgIGVsc2UgaWYg KHBrZy0+aW5zdGFsbGVkKQorCXsKKwkgIGlmIChwa2ctPnBpY2tlZCgpKQor CSAgICBxLmFkZChwa2ctPmluc3RhbGxlZCwgU29sdmVyVGFza3M6OnRhc2tS ZWluc3RhbGwpOyAvLyByZWluc3RhbGwKKwkgIGVsc2UgaWYgKHVwZ3JhZGUg JiYgcGtnLT5pbnN0YWxsZWQgPCBwa2ctPmRlZmF1bHRfdmVyc2lvbikKKwkg ICAgcS5hZGQocGtnLT5pbnN0YWxsZWQsIFNvbHZlclRhc2tzOjp0YXNrS2Vl cCk7IC8vIGtlZXAKKwl9CiAgICAgICAvLyBvbmx5IGluc3RhbGwgYWN0aW9u IG1ha2VzIHNlbnNlIGZvciBzb3VyY2UgcGFja2FnZXMKICAgICAgIGlmIChw a2ctPnNyY3BpY2tlZCgpKQogICAgICAgICB7Ci0tIAoyLjE0LjEKCg== --------------BA2BD0182B3AD89D6D772B18--