From c6e36b0492dc870c49dafbfb7aa76e28202f8ef0 Mon Sep 17 00:00:00 2001 From: Federico Bond Date: Thu, 15 May 2014 03:27:35 -0300 Subject: Fix NameError in macdeploy script --- contrib/macdeploy/macdeployqtplus | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/macdeploy/macdeployqtplus') diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 5c310df1fc..599713fbbb 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -580,7 +580,7 @@ try: except RuntimeError as e: if verbose >= 1: sys.stderr.write("Error: %s\n" % str(e)) - sys.exit(ret) + sys.exit(1) # ------------------------------------------------ @@ -593,7 +593,7 @@ if config.plugins: except RuntimeError as e: if verbose >= 1: sys.stderr.write("Error: %s\n" % str(e)) - sys.exit(ret) + sys.exit(1) # ------------------------------------------------ -- cgit v1.2.3 From d16f6f87e1c15bd686e0e74ddb671da95a916c6d Mon Sep 17 00:00:00 2001 From: Federico Bond Date: Thu, 15 May 2014 03:22:42 -0300 Subject: Remove unused imports in macdeploy script --- contrib/macdeploy/macdeployqtplus | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'contrib/macdeploy/macdeployqtplus') diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus index 5c310df1fc..4bfaadffd7 100755 --- a/contrib/macdeploy/macdeployqtplus +++ b/contrib/macdeploy/macdeployqtplus @@ -19,7 +19,6 @@ import subprocess, sys, re, os, shutil, stat, os.path from string import Template -from time import sleep from argparse import ArgumentParser # This is ported from the original macdeployqt with modifications @@ -488,16 +487,6 @@ if len(config.fancy) == 1: sys.stderr.write("Error: Could not import plistlib which is required for fancy disk images.\n") sys.exit(1) - if verbose >= 3: - print "Fancy: Importing appscript..." - try: - import appscript - except ImportError: - if verbose >= 1: - sys.stderr.write("Error: Could not import appscript which is required for fancy disk images.\n") - sys.stderr.write("Please install it e.g. with \"sudo easy_install appscript\".\n") - sys.exit(1) - p = config.fancy[0] if verbose >= 3: print "Fancy: Loading \"%s\"..." % p -- cgit v1.2.3