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.

2 files changed, 5 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 3d4fde2..d3318e9 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,7 @@ PACKAGE_BASE_VERSION := 2.0
 
 GIT_VERSION	 := $(shell git show -s --format=%ct HEAD)
 GIT_BRANCH	 := $(shell git rev-parse --abbrev-ref HEAD)
-GIT_BRANCHES	 := $(notdir $(shell git for-each-ref --format '%(refname)' refs/heads/))
+GIT_BRANCHES	 := $(filter-out HEAD,$(sort $(notdir $(shell git for-each-ref --format '%(refname)' refs/heads/ refs/remotes/))))
 
 # Make voodoo: construct the package name, version number, and list of
 # other package names (constructed on other branches) with which this
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))