From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4875 invoked by alias); 4 Jun 2017 18:41:39 -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 4863 invoked by uid 89); 4 Jun 2017 18:41:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-11.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=Turney, turney, doh 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; Sun, 04 Jun 2017 18:41:37 +0000 X-CornellRouted: This message has been Routed already. Received: from authusersmtp.mail.cornell.edu (granite3.serverfarm.cornell.edu [10.16.197.8]) by limerock01.mail.cornell.edu (8.14.4/8.14.4_cu) with ESMTP id v54IfdrI031915 for ; Sun, 4 Jun 2017 14:41:39 -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 v54Ifbf5026774 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Sun, 4 Jun 2017 14:41:38 -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> <571c1a5c-d47d-fdb6-61ef-aeeb26f4d7fa@cornell.edu> <0483ee06-da53-8c7d-db7a-c27c849c2ac5@dronecode.org.uk> From: Ken Brown Message-ID: <11b197ae-4b2d-fb3f-ce26-af8e7c493b03@cornell.edu> Date: Sun, 04 Jun 2017 18:41: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: <0483ee06-da53-8c7d-db7a-c27c849c2ac5@dronecode.org.uk> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-PMX-Cornell-Gauge: Gauge=XXXXX X-PMX-CORNELL-AUTH-RESULTS: dkim-out=none; X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg00004.txt.bz2 On 5/25/2017 6:10 PM, Jon Turney wrote: > On 23/05/2017 19:16, Ken Brown wrote: >> 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. > > Of course it does. Doh! > >>>> + 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. > > Thanks, applied. Is sourceware running the latest version of calm (with this patch applied)? I just tried an upload and got the following error: ERROR: package 'texlive-collection-htmlxml' version '20170520-1' source has no non-empty install tarfiles ERROR: error while validating merged x86 packages for Ken Brown ERROR: package 'texlive-collection-htmlxml' version '20170520-1' source has no non-empty install tarfiles ERROR: error while validating merged x86_64 packages for Ken Brown SUMMARY: 4 ERROR(s) Ken