diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2022-01-29 18:56:21 +0300 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2022-01-29 21:10:49 +0300 |
commit | 88b57728790ae1556d545697c15f315dfa182e75 (patch) | |
tree | 8d73aac9cc38111e96ae34920bb11912711ffea5 | |
parent | 3282d5c98e7bbad81abe17bdf42507f330c35caf (diff) |
Don't emit depends: etc. when there's no install package
Don't emit useless depends:, obsoletes:, provides: or conflicts: lines
when there's no install package for this version, only a source package.
-rwxr-xr-x | calm/package.py | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/calm/package.py b/calm/package.py index 947d06b..a6b20af 100755 --- a/calm/package.py +++ b/calm/package.py @@ -1100,11 +1100,18 @@ def write_setup_ini(args, packages, arch): # which case we should emit a 'Source:' line, and the package is # also itself emitted. - if hints.get('depends', '') or requires: - print("depends2: %s" % hints.get('depends', ''), file=f) + if version in po.versions(): + if hints.get('depends', '') or requires: + print("depends2: %s" % hints.get('depends', ''), file=f) + + if hints.get('obsoletes', ''): + print("obsoletes: %s" % hints['obsoletes'], file=f) + + if hints.get('provides', ''): + print("provides: %s" % hints['provides'], file=f) - if hints.get('obsoletes', ''): - print("obsoletes: %s" % hints['obsoletes'], file=f) + if hints.get('conflicts', ''): + print("conflicts: %s" % hints['conflicts'], file=f) if s: src_hints = packages[s].version_hints.get(version, {}) @@ -1120,12 +1127,6 @@ def write_setup_ini(args, packages, arch): if bd: print("build-depends: %s" % ', '.join(bd), file=f) - if hints.get('provides', ''): - print("provides: %s" % hints['provides'], file=f) - - if hints.get('conflicts', ''): - print("conflicts: %s" % hints['conflicts'], file=f) - # helper function to output details for a particular tar file def tar_line(p, category, v, f): |