diff options
| author | Rob Austein <sra@hactrn.net> | 2016-12-14 17:21:51 -0500 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-12-14 17:21:51 -0500 |
| commit | 05b269a88a47d3f9cb3d22d1d638cdff8f012da5 (patch) | |
| tree | b7b44adaf5dc098761512be2c638358aa033ee6a /scripts | |
| parent | 5318fa839106c61b18af0038b147b977e29f59f3 (diff) | |
Minor tweaks to branch-based package conflict hacks.
Get conflict indentation right in generated Homebrew formula.
Consider remote branches as well as local ones when constructing
conflict list, so that we don't omit a conflicting package just
because we've never checked it out in this build tree.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build-homebrew-formula.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/build-homebrew-formula.py b/scripts/build-homebrew-formula.py index 6d43b45..f2f1f54 100755 --- a/scripts/build-homebrew-formula.py +++ b/scripts/build-homebrew-formula.py @@ -92,8 +92,11 @@ end with open(args.tarball, "rb") as f: digest = hashlib.sha256(f.read()).hexdigest() +conflicts = "".join(" conflicts_with \"{}\", :because => \"firmware and pkcs11 library must match\"\n".format(i) + for i in args.conflicts) + args.formula.write(template.format( version = args.version, url = os.path.join(args.url_base, os.path.basename(args.tarball)), sha256 = digest, - conflicts = "".join("conflicts_with \"{}\", :because => \"firmware and pkcs11 library must match\"\n".format(i) for i in args.conflicts))) + conflicts = conflicts)) |