From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 46586 invoked by alias); 31 Jan 2018 18:30:47 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 46474 invoked by uid 9795); 31 Jan 2018 18:30:35 -0000 Date: Wed, 31 Jan 2018 18:30:00 -0000 Message-ID: <20180131183035.46443.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20180130-1-ga4adfe5 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: e8d59c5257d8d1b75a9a58102759300be2455cd3 X-Git-Newrev: a4adfe5b458781bf5b515dbcab71f1977194e11c X-SW-Source: 2018-q1/txt/msg00030.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=a4adfe5b458781bf5b515dbcab71f1977194e11c commit a4adfe5b458781bf5b515dbcab71f1977194e11c Author: Jon Turney Date: Tue Jan 30 22:53:48 2018 +0000 Don't suppress empty depends2: when that could cause problems Don't suppress empty depends2: if there might be a preceeding non-empty depends2: or requires: This is neccessary to ensure setup's parsing code doesn't re-use a previous non-empty value for the version under consideration. Diff: --- calm/package.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/calm/package.py b/calm/package.py index 238e048..9d73d1b 100755 --- a/calm/package.py +++ b/calm/package.py @@ -862,7 +862,7 @@ def write_setup_ini(args, packages, arch): for hints in packages[p].version_hints.values(): if 'requires' in hints: requires = set.union(requires, hints['requires'].split()) - # for historical reasons, empty requires are suppressed + # empty requires are suppressed as setup's parser can't handle that if requires: print("requires: %s" % ' '.join(sorted(requires)), file=f)