Installer oops

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

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 <kovid@kovidgoyal.net>"
 __appname__   = 'libprs500'

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])