From: Ken Brown <kbrown@cornell.edu>
To: cygwin-apps@cygwin.com
Subject: Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package
Date: Sun, 04 Jun 2017 18:41:00 -0000 [thread overview]
Message-ID: <11b197ae-4b2d-fb3f-ce26-af8e7c493b03@cornell.edu> (raw)
In-Reply-To: <0483ee06-da53-8c7d-db7a-c27c849c2ac5@dronecode.org.uk>
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
next prev parent reply other threads:[~2017-06-04 18:41 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-23 13:44 Ken Brown
2017-05-23 16:55 ` Jon Turney
2017-05-23 18:16 ` Ken Brown
2017-05-25 22:11 ` Jon Turney
2017-06-04 18:41 ` Ken Brown [this message]
2017-06-04 18:54 ` Jon Turney
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11b197ae-4b2d-fb3f-ce26-af8e7c493b03@cornell.edu \
--to=kbrown@cornell.edu \
--cc=cygwin-apps@cygwin.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).