From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 70914 invoked by alias); 23 May 2017 18:16:59 -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 69826 invoked by uid 89); 23 May 2017 18:16:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 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= 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; Tue, 23 May 2017 18:16:56 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite3.serverfarm.cornell.edu [10.16.197.8]) by limerock02.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id v4NIGwAM001775 for ; Tue, 23 May 2017 14:16:58 -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 v4NIGqAC020320 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Tue, 23 May 2017 14:16:53 -0400 Subject: Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package To: cygwin-apps@cygwin.com References: <6c13643f-5005-9629-77f7-f34f48b60f3e@cornell.edu> <9db0d971-9bf7-b917-269b-79a3742e3dcc@dronecode.org.uk> From: Ken Brown Message-ID: <571c1a5c-d47d-fdb6-61ef-aeeb26f4d7fa@cornell.edu> Date: Tue, 23 May 2017 18:16:00 -0000 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 In-Reply-To: <9db0d971-9bf7-b917-269b-79a3742e3dcc@dronecode.org.uk> Content-Type: multipart/mixed; boundary="------------1041F74B4881A29C9238A1BE" X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-05/txt/msg00143.txt.bz2 This is a multi-part message in MIME format. --------------1041F74B4881A29C9238A1BE Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 1192 On 5/23/2017 12:55 PM, Jon Turney wrote: > On 23/05/2017 14:44, Ken Brown wrote: >> I've created an obsolete package (as discussed starting at >> https://sourceware.org/ml/cygwin-apps/2017-05/msg00084.html). But >> mksetupini doesn't like it: >> >> mksetupini: package 'texlive-collection-htmlxml' version '20170520-1' >> source has no non-empty install tarfiles >> mksetupini: package set has errors, not writing setup.ini >> >> I thought the following would fix it: >> >> --- a/calm/package.py >> +++ b/calm/package.py >> @@ -636,6 +636,9 @@ def validate_packages(args, packages): >> if >> packages[p].tars[packages[p].vermap[v]['source']].is_empty: >> continue > > This should be being caught by this case (source is empty), but it > isn't, I guess because it's got a .keep file due to other problems > previously discussed. The source contains a .cygport file and a fake upstream source tarball. >> >> + if '_obsolete' in packages[p].vermap[v].get('category', ''): >> + continue > > I think this maybe needs to be > packages[p].version_hints[v].get('category', '') ? Yes, that fixes it, thanks. Patch attached. Ken --------------1041F74B4881A29C9238A1BE Content-Type: text/plain; charset=UTF-8; name="0001-Allow-an-obsolete-package-with-source-to-have-empty-.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename*0="0001-Allow-an-obsolete-package-with-source-to-have-empty-.pa"; filename*1="tch" Content-length: 1249 RnJvbSA1MzAxNDYyMGQ4YzFjNTRmMGZjOGJlZGU0NThhZjk3MDljNjIxNDJk IE1vbiBTZXAgMTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBLZW4gQnJvd24gPGti cm93bkBjb3JuZWxsLmVkdT4KRGF0ZTogVHVlLCAyMyBNYXkgMjAxNyAxNDox MzoyOSAtMDQwMApTdWJqZWN0OiBbUEFUQ0hdIEFsbG93IGFuIG9ic29sZXRl IHBhY2thZ2Ugd2l0aCBzb3VyY2UgdG8gaGF2ZSBlbXB0eSBpbnN0YWxsCiB0 YXJmaWxlcwoKLS0tCiBjYWxtL3BhY2thZ2UucHkgfCAzICsrKwogMSBmaWxl IGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2NhbG0v cGFja2FnZS5weSBiL2NhbG0vcGFja2FnZS5weQppbmRleCA2ZGRiNGE1Li5i MGVjMzYwIDEwMDc1NQotLS0gYS9jYWxtL3BhY2thZ2UucHkKKysrIGIvY2Fs bS9wYWNrYWdlLnB5CkBAIC02MzYsNiArNjM2LDkgQEAgZGVmIHZhbGlkYXRl X3BhY2thZ2VzKGFyZ3MsIHBhY2thZ2VzKToKICAgICAgICAgICAgIGlmIHBh Y2thZ2VzW3BdLnRhcnNbcGFja2FnZXNbcF0udmVybWFwW3ZdWydzb3VyY2Un XV0uaXNfZW1wdHk6CiAgICAgICAgICAgICAgICAgY29udGludWUKIAorICAg ICAgICAgICAgaWYgJ19vYnNvbGV0ZScgaW4gcGFja2FnZXNbcF0udmVyc2lv bl9oaW50c1t2XS5nZXQoJ2NhdGVnb3J5JywgJycpOgorICAgICAgICAgICAg ICAgIGNvbnRpbnVlCisKICAgICAgICAgICAgIGlmIG5vdCBwYWNrYWdlc1tw XS50YXJzW3BhY2thZ2VzW3BdLnZlcm1hcFt2XVsnc291cmNlJ11dLmlzX3Vz ZWQ6CiAgICAgICAgICAgICAgICAgbG9nZ2luZy5lcnJvcigicGFja2FnZSAn JXMnIHZlcnNpb24gJyVzJyBzb3VyY2UgaGFzIG5vIG5vbi1lbXB0eSBpbnN0 YWxsIHRhcmZpbGVzIiAlIChwLCB2KSkKICAgICAgICAgICAgICAgICBlcnJv ciA9IFRydWUKLS0gCjIuMTIuMwoK --------------1041F74B4881A29C9238A1BE--