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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build-debian-control-files.py') 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 = "" -- cgit v1.2.3