From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32697 invoked by alias); 25 May 2017 22:11:01 -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 31716 invoked by uid 89); 25 May 2017 22:11:00 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-12.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy=Hx-spam-relays-external:ESMTPA X-HELO: out1-smtp.messagingengine.com Received: from out1-smtp.messagingengine.com (HELO out1-smtp.messagingengine.com) (66.111.4.25) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 25 May 2017 22:10:59 +0000 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 1BC6720954 for ; Thu, 25 May 2017 18:11:01 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute6.internal (MEProxy); Thu, 25 May 2017 18:11:01 -0400 X-ME-Sender: Received: from [192.168.1.102] (host86-141-128-130.range86-141.btcentralplus.com [86.141.128.130]) by mail.messagingengine.com (Postfix) with ESMTPA id B17407E9BA for ; Thu, 25 May 2017 18:11:00 -0400 (EDT) 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> From: Jon Turney Message-ID: <0483ee06-da53-8c7d-db7a-c27c849c2ac5@dronecode.org.uk> Date: Thu, 25 May 2017 22:11: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: <571c1a5c-d47d-fdb6-61ef-aeeb26f4d7fa@cornell.edu> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-SW-Source: 2017-05/txt/msg00154.txt.bz2 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.