From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 120704 invoked by alias); 30 Jan 2018 22:57:58 -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 120681 invoked by uid 9795); 30 Jan 2018 22:57:58 -0000 Date: Tue, 30 Jan 2018 22:57:00 -0000 Message-ID: <20180130225758.120653.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-ge8d59c5 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 2662795bfb198c27a8e5fc0c336942a4edcd8021 X-Git-Newrev: e8d59c5257d8d1b75a9a58102759300be2455cd3 X-SW-Source: 2018-q1/txt/msg00028.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=e8d59c5257d8d1b75a9a58102759300be2455cd3 commit e8d59c5257d8d1b75a9a58102759300be2455cd3 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 ee3a377..238e048 100755 --- a/calm/package.py +++ b/calm/package.py @@ -952,7 +952,7 @@ def write_setup_ini(args, packages, arch): else: logging.warning("package '%s' version '%s' has no source in external-source '%s'" % (p, version, s)) - if packages[p].version_hints[version].get('depends', ''): + if packages[p].version_hints[version].get('depends', '') or requires: print("depends2: %s" % packages[p].version_hints[version]['depends'], file=f) if packages[p].version_hints[version].get('obsoletes', ''):