Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-06-04 Thread Jon Turney 

On 04/06/2017 19:41, Ken Brown wrote:

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)



It appears not.  I meant to do a deploy, but obviously forgot...

I've updated it now.

Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-06-04 Thread Ken Brown 

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

Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-05-25 Thread Jon Turney 

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.

Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-05-23 Thread Ken Brown 

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
From 53014620d8c1c54f0fc8bede458af9709c62142d Mon Sep 17 00:00:00 2001
From: Ken Brown 
Date: Tue, 23 May 2017 14:13:29 -0400
Subject: [PATCH] Allow an obsolete package with source to have empty install
 tarfiles

---
 calm/package.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/calm/package.py b/calm/package.py
index 6ddb4a5..b0ec360 100755
--- 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
 
+if '_obsolete' in packages[p].version_hints[v].get('category', ''):
+continue
+
 if not packages[p].tars[packages[p].vermap[v]['source']].is_used:
 logging.error("package '%s' version '%s' source has no 
non-empty install tarfiles" % (p, v))
 error = True
-- 
2.12.3

Re: calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-05-23 Thread Jon Turney 

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.




+if '_obsolete' in packages[p].vermap[v].get('category', ''):
+continue


I think this maybe needs to be 
packages[p].version_hints[v].get('category', '') ?



+
  if not packages[p].tars[packages[p].vermap[v]['source']].is_used:
  logging.error("package '%s' version '%s' source has no non-empty 
install tarfiles" % (p, v))
  error = True


But I must have something wrong, because I still get the error after this 
change.

calm: mksetupini doesn't allow non-empty source but empty install files for an obsolete package

2017-05-23 Thread Ken Brown 
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

+if '_obsolete' in packages[p].vermap[v].get('category', ''):
+continue
+
 if not packages[p].tars[packages[p].vermap[v]['source']].is_used:
 logging.error("package '%s' version '%s' source has no 
non-empty install tarfiles" % (p, v))
 error = True


But I must have something wrong, because I still get the error after this 
change.

Ken