From c2c1a714963fb19390cdeb08f4dc242df14aa60d Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Thu, 11 May 2017 13:42:01 -0400 Subject: 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. --- scripts/build-debian-control-files.py | 4 ++-- scripts/build-homebrew-formula.py | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'scripts') diff --git a/scripts/build-debian-control-files.py b/scripts/build-debian-control-files.py index cb679b2..a6ff169 100755 --- a/scripts/build-debian-control-files.py +++ b/scripts/build-debian-control-files.py @@ -10,7 +10,7 @@ parser.add_argument("--debemail", required = True) parser.add_argument("--package", required = True) parser.add_argument("--newversion", required = True) parser.add_argument("--description", default = "Software and firmware for Cryptech Alpha development board.") -parser.add_argument("--conflicts", nargs = "*") +parser.add_argument("--conflicts", default = "") args = parser.parse_args() @@ -43,7 +43,7 @@ Description: Cryptech Project open-source cryptographic software and firmware. ''' if args.conflicts: - conflicts = "Conflicts: {}\n".format(" ".join(args.conflicts)) + conflicts = "Conflicts: {}\n".format(args.conflicts) else: conflicts = "" 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)) -- cgit v1.2.3