This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package
- From: Ken Brown <kbrown at cornell dot edu>
- To: cygwin-apps at cygwin dot com
- Date: Sun, 4 Jun 2017 14:41:37 -0400
- Subject: Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package
- Authentication-results: sourceware.org; auth=none
- 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>
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