diff options
| author | Rob Austein <sra@hactrn.net> | 2017-05-11 13:42:01 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2017-05-11 13:42:01 -0400 |
| commit | c2c1a714963fb19390cdeb08f4dc242df14aa60d (patch) | |
| tree | 64f3283659887f6b54cdbf2f787d719d7a2c2dde /scripts/build-homebrew-formula.py | |
| parent | dd5950077b622a72a1bd04df092804a10c108d8c (diff) | |
Fix --conflicts inconsistency between build scripts and Makefile.
scripts/build-*.py were treating --conflicts as a sequence of
arguments while Makefile was treating as a single argument whose value
might contain whitespace. No big deal either way for the scripts, and
Makefile is complicated enough, so go with Makefile's approach.
Add some pedantic quoting to Makefile while we're at this, out of
general paranoia and because the inconsistencies were puzzling.
Diffstat (limited to 'scripts/build-homebrew-formula.py')
| -rwxr-xr-x | scripts/build-homebrew-formula.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/build-homebrew-formula.py b/scripts/build-homebrew-formula.py index 618eb77..adffa10 100755 --- a/scripts/build-homebrew-formula.py +++ b/scripts/build-homebrew-formula.py @@ -8,12 +8,12 @@ import sys import os parser = argparse.ArgumentParser() -parser.add_argument("--url-base", default = "https://brew.cryptech.is/tarballs/") -parser.add_argument("--tarball", required = True) -parser.add_argument("--package", required = True) -parser.add_argument("--version", required = True) -parser.add_argument("--formula", type = argparse.FileType("w"), nargs = "?", default = sys.stdout) -parser.add_argument("--conflicts", nargs = "*") +parser.add_argument("--url-base", default = "https://brew.cryptech.is/tarballs/") +parser.add_argument("--tarball", required = True) +parser.add_argument("--package", required = True) +parser.add_argument("--version", required = True) +parser.add_argument("--formula", type = argparse.FileType("w"), nargs = "?", default = sys.stdout) +parser.add_argument("--conflicts", default = "") args = parser.parse_args() template = '''\ @@ -105,8 +105,8 @@ with open(args.tarball, "rb") as f: classname = "".join(word.capitalize() for word in args.package.split("-")) -conflicts = "".join(" conflicts_with \"{}\", :because => \"HSM firmware and PKCS #11 library must match each other\"\n".format(i) - for i in args.conflicts) +conflicts = "".join(" conflicts_with \"{}\", :because => \"HSM firmware and PKCS #11 library must match\"\n".format(conflict) + for conflict in args.conflicts.split()) url = os.path.join(args.url_base, os.path.basename(args.tarball)) |