From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 88611 invoked by alias); 19 Oct 2017 21:36:16 -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 88588 invoked by uid 89); 19 Oct 2017 21:36:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 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=Thinking, U*kbrown, kbrowncornelledu, kbrown@cornell.edu X-HELO: limerock02.mail.cornell.edu Received: from limerock02.mail.cornell.edu (HELO limerock02.mail.cornell.edu) (128.84.13.242) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 19 Oct 2017 21:36:13 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite4.serverfarm.cornell.edu [10.16.197.9]) by limerock02.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id v9JLaBCM008364 for ; Thu, 19 Oct 2017 17:36:11 -0400 Received: from [192.168.0.4] (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 v9JLa9Bo020533 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Thu, 19 Oct 2017 17:36:10 -0400 Subject: Re: [PATCH] Revert "Don't override a Keep selection" To: cygwin-apps@cygwin.com References: <20171016191321.9504-1-kbrown@cornell.edu> <66510301-7c57-ac6c-9e4c-05cf5816d3a9@cornell.edu> <46f9afd9-03fb-b07c-de0e-22dd0586b153@cornell.edu> <63bf8a45-0661-7045-3dce-15c554e8248b@cornell.edu> From: Ken Brown Message-ID: <956a35ef-e577-a0ef-a758-f920b73a30eb@cornell.edu> Date: Thu, 19 Oct 2017 21:36:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <63bf8a45-0661-7045-3dce-15c554e8248b@cornell.edu> Content-Type: multipart/mixed; boundary="------------002E0FC1D28E48940D7C7536" X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-10/txt/msg00090.txt.bz2 This is a multi-part message in MIME format. --------------002E0FC1D28E48940D7C7536 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-length: 2274 On 10/19/2017 11:05 AM, Ken Brown wrote: > On 10/18/2017 11:01 PM, Ken Brown wrote: >> On 10/17/2017 3:31 PM, Ken Brown wrote: >>> On 10/17/2017 2:43 PM, Jon Turney wrote: >>>> On 16/10/2017 20:13, Ken Brown wrote: >>>>> This reverts (the rest of) commit b43b697.  Part of that commit was >>>>> already reverted in commit ff0bb3d.  The rest is not needed either >>>>> since we no longer send the upgrade flag to the solver after the user >>>>> has made their selections. >>>>> --- >>>>>   libsolv.cc     | 14 +++----------- >>>>>   libsolv.h      |  1 - >>>>>   package_meta.h |  2 -- >>>>>   3 files changed, 3 insertions(+), 14 deletions(-) >>>> >>>> Hmm... not sure about this. >>>> >>>> Say the initial upgrade solution had something like: package A 1.0 >>>> -> 1.1, and A 1.1 has a dependency on package B 2.0, where currently >>>> B 1.0 is installed (so B 1.0 -> 2.0) >>>> >>>> If the user then changes B to 'keep' (at 1.0), we should report a >>>> conflict? >>> >>> Good point.  I wasn't thinking about dependencies with version >>> relations. >> >> I just tested this scenario, and it turns out that putting a lock on B >> 1.0 overrides the dependency of A 1.1 on B 2.0.  There's no problem >> reported.  On the other hand, if there's no lock, then the dependency >> overrides the Keep choice, again with no problem reported. >> >> Back to the drawing board. > > Thinking about this further, using SOLVER_LOCK is probably the right > thing to do in this situation, even if no problem is reported.  We can't > insist that users install the recommended version.  For example, if I > choose to downgrade binutils while keeping the current gcc, then I'm > responsible for any breakage this might cause, with or without a warning > from setup. > > I'll prepare a new patch that restores the SOLVER_LOCK functionality > that was inadvertently removed in commit ff0bb3d. Attached. I kept making mistakes while doing this, so I hope I got it right in the end. Here's a related question. Currently if libsolv decides I should install something and I choose Skip instead, it will get installed anyway (with no problem report). Maybe we should have a taskSkip that generates a SOLVER_LOCK in that case, analogous to taskKeep? Ken --------------002E0FC1D28E48940D7C7536 Content-Type: text/plain; charset=UTF-8; name="0001-Fix-the-functionality-of-taskKeep.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Fix-the-functionality-of-taskKeep.patch" Content-length: 5267 RnJvbSA2MTA0MjZlYWJlY2NiM2MwNGJiZDdmNDk4NjIyNDhiZWI4MmIyODBh IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLZW4gQnJvd24gPGti cm93bkBjb3JuZWxsLmVkdT4KRGF0ZTogVGh1LCAxOSBPY3QgMjAxNyAxNDo0 NDo0NSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEZpeCB0aGUgZnVuY3Rpb25h bGl0eSBvZiB0YXNrS2VlcAoKQSB0YXNrS2VlcCBpcyBnZW5lcmF0ZWQgd2hl bmV2ZXIgdGhlIHVzZXIgd2FudHMgdG8ga2VlcCBhbiBpbnN0YWxsZWQKdmVy c2lvbiB0aGF0J3MgZGlmZmVyZW50IGZyb20gdGhlIGRlZmF1bHRfdmVyc2lv biwgd2hlcmUgdGhlIGxhdHRlciBpcwp3aGF0ZXZlciB0aGUgc29sdmVyIGhh cyBjaG9zZW4uICBXZSBuZWVkIHRvIG1ha2Ugc3VyZSB0aGF0CmRlZmF1bHRf dmVyc2lvbiBpcyBzZXQgYXBwcm9wcmlhdGVseSB3aGVyZXZlciBpdCBpcyBu ZWVkZWQuCi0tLQogY2hvb3NlLmNjICAgICAgfCAgNyArKysrKysrCiBsaWJz b2x2LmNjICAgICB8IDExICsrKysrKy0tLS0tCiBwYWNrYWdlX21ldGEuaCB8 ICAyICstCiBwcmVyZXEuY2MgICAgICB8ICAzICstLQogNCBmaWxlcyBjaGFu Z2VkLCAxNSBpbnNlcnRpb25zKCspLCA4IGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL2Nob29zZS5jYyBiL2Nob29zZS5jYwppbmRleCBmMGU2ODAyLi5h ZDM3NjM5IDEwMDY0NAotLS0gYS9jaG9vc2UuY2MKKysrIGIvY2hvb3NlLmNj CkBAIC00MjAsNiArNDIwLDEzIEBAIENob29zZXJQYWdlOjpjaGFuZ2VUcnVz dChpbnQgYnV0dG9uLCBib29sIHRlc3QsIGJvb2wgaW5pdGlhbCkKICAgICB7 CiAgICAgICAvLyBidXQgaW5pdGlhbGx5IHdlIHdhbnQgYSB0YXNrIGxpc3Qg d2l0aCBhbnkgcGFja2FnZSBjaGFuZ2VzIGNhdXNlZCBieQogICAgICAgLy8g Y29tbWFuZCBsaW5lIG9wdGlvbnMKKyAgICAgIC8vIGFuZCB3ZSBkb24ndCB3 YW50IHRvIGdlbmVyYXRlIHNwdXJpb3VzIEtlZXAgdGFza3MKKyAgICAgIGZv ciAocGFja2FnZWRiOjpwYWNrYWdlY29sbGVjdGlvbjo6aXRlcmF0b3IgcCA9 IGRiLnBhY2thZ2VzLmJlZ2luICgpOworCSAgIHAgIT0gZGIucGFja2FnZXMu ZW5kICgpOyArK3ApCisJeworCSAgcGFja2FnZW1ldGEgKnBrZyA9IHAtPnNl Y29uZDsKKwkgIHBrZy0+ZGVmYXVsdF92ZXJzaW9uID0gcGtnLT5pbnN0YWxs ZWQ7CisJfQogICAgICAgcS5zZXRUYXNrcygpOwogICAgIH0KICAgZGIuZGVm YXVsdFRydXN0KHEsIG1vZGUsIHRlc3QpOwpkaWZmIC0tZ2l0IGEvbGlic29s di5jYyBiL2xpYnNvbHYuY2MKaW5kZXggMjg5ZjE5Yy4uZTYyMzU1NSAxMDA2 NDQKLS0tIGEvbGlic29sdi5jYworKysgYi9saWJzb2x2LmNjCkBAIC01MjYs NyArNTI2LDggQEAgU29sdmVyVGFza3M6OnNldFRhc2tzKCkKIAogICAgICAg Ly8gZGVjb2RlIFVJIHN0YXRlIHRvIGFjdGlvbgogICAgICAgLy8gc2tpcCBh bmQga2VlcCBkb24ndCBjaGFuZ2UgZGVwZW5kZW5jeSBzb2x1dGlvbgotICAg ICAgLy8gZXhjZXB0IHdoZW4gd2Ugd2FudCB0byBrZWVwIGFuIG9sZCB2ZXJz aW9uCisgICAgICAvLyBleGNlcHQgd2hlbiB3ZSB3YW50IHRvIGtlZXAgYSB2 ZXJzaW9uIGRpZmZlcmVudCBmcm9tIHRoZSBvbmUKKyAgICAgIC8vIGNob3Nl biBieSB0aGUgc29sdmVyCiAgICAgICBpZiAocGtnLT5pbnN0YWxsZWQgIT0g cGtnLT5kZXNpcmVkKQogICAgICAgICB7CiAgICAgICAgICAgaWYgKHBrZy0+ ZGVzaXJlZCkKQEAgLTUzOCw3ICs1MzksNyBAQCBTb2x2ZXJUYXNrczo6c2V0 VGFza3MoKQogCXsKIAkgIGlmIChwa2ctPnBpY2tlZCgpKQogCSAgICBhZGQo cGtnLT5pbnN0YWxsZWQsIHRhc2tSZWluc3RhbGwpOyAvLyByZWluc3RhbGwK LQkgIGVsc2UgaWYgKHBrZy0+aW5zdGFsbGVkIDwgcGtnLT5kZWZhdWx0X3Zl cnNpb24pCisJICBlbHNlIGlmIChwa2ctPmluc3RhbGxlZCAhPSBwa2ctPmRl ZmF1bHRfdmVyc2lvbikKIAkgICAgYWRkKHBrZy0+aW5zdGFsbGVkLCB0YXNr S2VlcCk7IC8vIGtlZXAKIAl9CiAgICAgICAvLyBvbmx5IGluc3RhbGwgYWN0 aW9uIG1ha2VzIHNlbnNlIGZvciBzb3VyY2UgcGFja2FnZXMKQEAgLTU5MSw3 ICs1OTIsNyBAQCBTb2x2ZXJTb2x1dGlvbjo6dHJhbnMyZGIoKSBjb25zdAog ICAgICAgIGkgIT0gZGIucGFja2FnZXMuZW5kKCk7IGkrKykKICAgICB7CiAg ICAgICBwYWNrYWdlbWV0YSAqcGtnID0gaS0+c2Vjb25kOwotICAgICAgcGtn LT5kZXNpcmVkID0gcGtnLT5pbnN0YWxsZWQ7CisgICAgICBwa2ctPmRlc2ly ZWQgPSBwa2ctPmRlZmF1bHRfdmVyc2lvbiA9IHBrZy0+aW5zdGFsbGVkOwog ICAgICAgcGtnLT5waWNrKGZhbHNlKTsKICAgICB9CiAgIC8vIE5vdyBtYWtl IGNoYW5nZXMgYWNjb3JkaW5nIHRvIHRyYW5zLiAgdHJhbnNFcmFzZSByZXF1 aXJlcyBzb21lCkBAIC02MTQsNyArNjE1LDcgQEAgU29sdmVyU29sdXRpb246 OnRyYW5zMmRiKCkgY29uc3QKIAljYXNlIFNvbHZlclRyYW5zYWN0aW9uOjp0 cmFuc0luc3RhbGw6CiAJICBpZiAocHYuVHlwZSgpID09IHBhY2thZ2VfYmlu YXJ5KQogCSAgICB7Ci0JICAgICAgcGtnLT5kZXNpcmVkICA9IHB2OworCSAg ICAgIHBrZy0+ZGVzaXJlZCA9IHBrZy0+ZGVmYXVsdF92ZXJzaW9uID0gcHY7 CiAJICAgICAgcGtnLT5waWNrKHRydWUpOwogCSAgICB9CiAJICBlbHNlCQkJ Ly8gc291cmNlIHBhY2thZ2UKQEAgLTYyMyw3ICs2MjQsNyBAQCBTb2x2ZXJT b2x1dGlvbjo6dHJhbnMyZGIoKSBjb25zdAogCWNhc2UgU29sdmVyVHJhbnNh Y3Rpb246OnRyYW5zRXJhc2U6CiAJICAvLyBPbmx5IHJlbGV2YW50IGlmIHBr ZyBpcyBzdGlsbCBpbiBpdHMgIm5vIGNoYW5nZSIgc3RhdGUKIAkgIGlmIChw a2ctPmRlc2lyZWQgPT0gcGtnLT5pbnN0YWxsZWQgJiYgIXBrZy0+cGlja2Vk KCkpCi0JICAgIHBrZy0+ZGVzaXJlZCA9IHBhY2thZ2V2ZXJzaW9uKCk7CisJ ICAgIHBrZy0+ZGVzaXJlZCA9IHBrZy0+ZGVmYXVsdF92ZXJzaW9uID0gcGFj a2FnZXZlcnNpb24oKTsKIAkgIGJyZWFrOwogCWRlZmF1bHQ6CiAJICBicmVh azsKZGlmZiAtLWdpdCBhL3BhY2thZ2VfbWV0YS5oIGIvcGFja2FnZV9tZXRh LmgKaW5kZXggZDkxZjdjOS4uOTgyNTNkMCAxMDA2NDQKLS0tIGEvcGFja2Fn ZV9tZXRhLmgKKysrIGIvcGFja2FnZV9tZXRhLmgKQEAgLTEzMSw3ICsxMzEs NyBAQCBwdWJsaWM6CiAgIHBhY2thZ2V2ZXJzaW9uIGN1cnI7CiAgIC8qIGRp dHRvIGZvciAidGVzdCIgKGV4cGVyaW1lbnRhbCkgKi8KICAgcGFja2FnZXZl cnNpb24gZXhwOwotICAvKiB3aGljaCBvbmUgaXMgdGhlIGRlZmF1bHQgYWNj b3JkaW5nIHRvIHRoZSBjaG9vc2VyIGdsb2JhbCBzdGF0ZSAqLworICAvKiB3 aGljaCBvbmUgaXMgdGhlIGRlZmF1bHQgYWNjb3JkaW5nIHRvIHRoZSBzb2x2 ZXIgKi8KICAgcGFja2FnZXZlcnNpb24gZGVmYXVsdF92ZXJzaW9uOwogICAv KiBOb3cgZm9yIHRoZSB1c2VyIHN0dWZmIDpdICovCiAgIC8qIFdoYXQgdmVy c2lvbiBkb2VzIHRoZSB1c2VyIHdhbnQgPyAqLwpkaWZmIC0tZ2l0IGEvcHJl cmVxLmNjIGIvcHJlcmVxLmNjCmluZGV4IGM1YTFmZDUuLmJmNzY2MWEgMTAw NjQ0Ci0tLSBhL3ByZXJlcS5jYworKysgYi9wcmVyZXEuY2MKQEAgLTEzNiw4 ICsxMzYsNyBAQCBQcmVyZXFQYWdlOjp3aGF0TmV4dCAoKQogbG9uZwogUHJl cmVxUGFnZTo6T25CYWNrICgpCiB7Ci0gIC8vIFJlc2V0IHRoZSBwYWNrYWdl IGRhdGFiYXNlIHRvIGNvcnJlc3BvbmQgdG8gdGhlIHNvbHZlcidzIGRlZmF1 bHQKLSAgLy8gc29sdXRpb24KKyAgLy8gUmVzZXQgdGhlIHBhY2thZ2UgZGF0 YWJhc2UgdG8gY29ycmVzcG9uZCB0byB0aGUgc29sdmVyJ3Mgc29sdXRpb24K ICAgcGFja2FnZWRiIGRiOwogICBkYi5zb2x1dGlvbi50cmFuczJkYigpOwog Ci0tIAoyLjE0LjIKCg== --------------002E0FC1D28E48940D7C7536--