From: Daira Hopwood <daira@jacaranda.org>
Date: Mon, 13 Oct 2014 16:27:47 +0000 (+0100)
Subject: Fix mistake in refactoring of test-osx-pkg.py.
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=refs%2Fheads%2F182-osx-packaging-4;p=tahoe-lafs%2Ftahoe-lafs.git

Fix mistake in refactoring of test-osx-pkg.py.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/misc/build_helpers/test-osx-pkg.py b/misc/build_helpers/test-osx-pkg.py
index 8d15a451..04dcef66 100644
--- a/misc/build_helpers/test-osx-pkg.py
+++ b/misc/build_helpers/test-osx-pkg.py
@@ -64,12 +64,12 @@ def test_osx_pkg(pkgfile):
 
     try:
         basedir = os.getcwd()
-        cmd = ['bin/' + appname, '--version-and-path']
+        cmd = ['bin/tahoe', '--version-and-path']
         callit = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
 
         rc = callit.wait()
         if rc != 0:
-            raise Exception("FAIL: $appname --version-and-path returned non-zero exit code: %r" % (rc,))
+            raise Exception("FAIL: '%s' returned non-zero exit code: %r" % (" ".join(cmd), rc))
         stdouttxt = callit.stdout.read()
 
         PKG_VER_PATH_RE=re.compile("^(\S+): ([^\(]+)\((.+?)\)$", re.UNICODE)