From a4adfe5b458781bf5b515dbcab71f1977194e11c Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 30 Jan 2018 22:53:48 +0000 Subject: 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. --- calm/package.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/package.py b/calm/package.py index ee3a377..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) @@ -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', ''): -- cgit v1.2.3