Only take subtitle data into account for position() if there is nothing

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 89bfff194bee6bf5041eb24f13bb64e42fcb6cff..4fc23bcb597c4c9ef40df1b1fc2fc83d5a1777f3 100644 (file)
--- a/wscript
+++ b/wscript
@@ -64,7 +64,7 @@ def options(opt):
     opt.add_option('--static-curl',       action='store_true', default=False, help='link statically to libcurl')
     opt.add_option('--workaround-gssapi', action='store_true', default=False, help='link to gssapi_krb5')
     opt.add_option('--force-cpp11',       action='store_true', default=False, help='force use of C++11')
-    opt.add_option('--variant',           help='build variant', choices=['swaroop-studio', 'swaroop-theater'])
+    opt.add_option('--variant',           help='build variant (swaroop-studio, swaroop-theater)', choices=['swaroop-studio', 'swaroop-theater'])
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -546,7 +546,7 @@ def download_supporters(can_fail):
     if (r >> 8) == 0:
         r = os.system('curl -s -f https://dcpomatic.com/subscribers.cc?%s > src/wx/subscribers.cc' % urlencode({"until": last_date.strip()}))
     if (r >> 8) != 0 and can_fail:
-        raise Exception("Could not download supporters lists (%d)", r >> 8)
+        raise Exception("Could not download supporters lists (%d)" % (r >> 8))
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)