From 0145dc3c10e6544aa83c9fef9519a66bd63e4339 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 13 Jun 2007 05:16:59 +0000 Subject: [PATCH] Installer oops --- osx_installer.py | 2 +- src/libprs500/__init__.py | 2 +- upload.py | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/osx_installer.py b/osx_installer.py index 71e8289d01..ea4e59e081 100644 --- a/osx_installer.py +++ b/osx_installer.py @@ -57,7 +57,7 @@ def _check_symlinks_prescript(): import os, tempfile, traceback, sys from Authorization import Authorization, kAuthorizationFlagDestroyRights - AUTHTOOL="""#!%s + AUTHTOOL="""#!%(sp)s import os scripts = %(sp)s links = %(sp)s diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 689794455b..3d6c38f012 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -13,7 +13,7 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ''' E-book management software''' -__version__ = "0.3.49" +__version__ = "0.3.50" __docformat__ = "epytext" __author__ = "Kovid Goyal " __appname__ = 'libprs500' diff --git a/upload.py b/upload.py index 13d5049773..9da2968055 100644 --- a/upload.py +++ b/upload.py @@ -40,10 +40,12 @@ def build_osx(): files = glob.glob('dist/*.dmg') for file in files: os.unlink(file) + if os.path.exists('dist/dmgdone'): + os.unlink('dist/dmgdone') vm = h.openVM('/mnt/extra/vmware/Mac OSX/Mac OSX.vmx') vm.powerOn() - c = 20 * 60 + c = 25 * 60 print 'Waiting (minutes):', while c > 0: if glob.glob('dist/*.dmg'): @@ -54,7 +56,7 @@ def build_osx(): print c, ',', print - if not glob.glob('dist/*.dmg'): + if not glob.glob('dist/dmgdone'): raise Exception('OSX build has failed') vm.powerOff() return os.path.basename(glob.glob('dist/*.dmg')[-1])