Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjim <jim@38b22f21-9aea-0310-abfc-843a9883df58>2008-12-03 04:27:41 (GMT)
committer jim <jim@38b22f21-9aea-0310-abfc-843a9883df58>2008-12-03 04:27:41 (GMT)
commit38fb3d752d65afdc0404bd3937985a6fb735858e (patch)
tree71014fe231efc609c8c1641ae40622643eff2949
parent49b2094bfa487e850cc994931f36dcc009ad933f (diff)
Handle non-integer contents in tmpExeStarupTime lock file
git-svn-id: https://exe.svn.sourceforge.net/svnroot/exe/trunk@3575 38b22f21-9aea-0310-abfc-843a9883df58
-rw-r--r--NEWS1
-rw-r--r--exe/application.py5
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 9bb076c..9b62a71 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
* Fix field IDs so that adding to a previously saved elp is consistent
* Fix Common Cartridge manifest when a header image is used
* Fix OS X and Linux configDir Firefox profile on filesystem without colon
+* Make startup lock file parsing more robust
* Only include a copy of GNU FDL if that is the license selected
* Re-enable loading of user extended iDevices from config directory
* Translation updates
diff --git a/exe/application.py b/exe/application.py
index 6df7ffd..b472a31 100644
--- a/exe/application.py
+++ b/exe/application.py
@@ -102,7 +102,10 @@ class Application:
inStartFH=open(eXeStart, "r")
lastRunTimeS = 0
for line in inStartFH:
- lastRunTimeS = int(line)
+ try:
+ lastRunTimeS = int(line)
+ except ValueError:
+ lastRunTimeS = 0
inStartFH.close()
log.debug('lastRunTimeS: ' + `lastRunTimeS`)