Installer oops

This commit is contained in:
Kovid Goyal 2007-06-13 05:16:59 +00:00
parent aaa6bc4c3f
commit 0145dc3c10
3 changed files with 6 additions and 4 deletions

View File

@ -57,7 +57,7 @@ def _check_symlinks_prescript():
import os, tempfile, traceback, sys import os, tempfile, traceback, sys
from Authorization import Authorization, kAuthorizationFlagDestroyRights from Authorization import Authorization, kAuthorizationFlagDestroyRights
AUTHTOOL="""#!%s AUTHTOOL="""#!%(sp)s
import os import os
scripts = %(sp)s scripts = %(sp)s
links = %(sp)s links = %(sp)s

View File

@ -13,7 +13,7 @@
## with this program; if not, write to the Free Software Foundation, Inc., ## with this program; if not, write to the Free Software Foundation, Inc.,
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
''' E-book management software''' ''' E-book management software'''
__version__ = "0.3.49" __version__ = "0.3.50"
__docformat__ = "epytext" __docformat__ = "epytext"
__author__ = "Kovid Goyal <kovid@kovidgoyal.net>" __author__ = "Kovid Goyal <kovid@kovidgoyal.net>"
__appname__ = 'libprs500' __appname__ = 'libprs500'

View File

@ -40,10 +40,12 @@ def build_osx():
files = glob.glob('dist/*.dmg') files = glob.glob('dist/*.dmg')
for file in files: for file in files:
os.unlink(file) 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 = h.openVM('/mnt/extra/vmware/Mac OSX/Mac OSX.vmx')
vm.powerOn() vm.powerOn()
c = 20 * 60 c = 25 * 60
print 'Waiting (minutes):', print 'Waiting (minutes):',
while c > 0: while c > 0:
if glob.glob('dist/*.dmg'): if glob.glob('dist/*.dmg'):
@ -54,7 +56,7 @@ def build_osx():
print c, ',', print c, ',',
print print
if not glob.glob('dist/*.dmg'): if not glob.glob('dist/dmgdone'):
raise Exception('OSX build has failed') raise Exception('OSX build has failed')
vm.powerOff() vm.powerOff()
return os.path.basename(glob.glob('dist/*.dmg')[-1]) return os.path.basename(glob.glob('dist/*.dmg')[-1])