Browse Source

Merge pull request #4187

d16f6f8 Remove unused imports in macdeploy script (Federico Bond)
try
Wladimir J. van der Laan 11 years ago
parent
commit
b73dc953a8
No known key found for this signature in database GPG Key ID: 74810B012346C9A6
  1. 4
      contrib/macdeploy/README.md
  2. 11
      contrib/macdeploy/macdeployqtplus

4
contrib/macdeploy/README.md

@ -1,9 +1,5 @@
### MacDeploy ###
You will need the appscript package for the fancy disk image creation to work:
sudo easy_install appscript
For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
sudo easy_install argparse

11
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

Loading…
Cancel
Save