changeset 39:a444cc89d51e

Merge updated set-up information with exception on stat usage.
author John Schneiderman <JohnMS@CodeGNU.com>
date Wed, 13 Aug 2014 18:43:41 -0500
parents bc8dd5547269 (current diff) ba88b8114b98 (diff)
children 23605f9372a8
files doc/TODO src/manager.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/manager.py	Wed Aug 13 18:35:07 2014 -0500
+++ b/src/manager.py	Wed Aug 13 18:43:41 2014 -0500
@@ -43,6 +43,7 @@
 	import os
 	import shutil
 	import filelock as guard
+	import stat
 
 	print "Acquiring manager lock ..."
 	lock = guard.FileLock('HWM')
@@ -276,6 +277,9 @@
 	ignores = {}
 	try:
 		ignores = ignorepo.extract('ignores.xml')
+	except IOError as e:
+		print >>sys.stderr, "Failed to locate ignores, error: %s" % e.message
+		return False
 	except xml.parsers.expat.ExpatError as e:
 		print >>sys.stderr, "Failed to extract ignores, error: %s" % e.message
 		return False
@@ -446,7 +450,7 @@
 
 	parser = SafeConfigParser()
 	if not parser.read(settings.HgWebPath + os.sep + 'hgweb.config'):
-		print >>sys.stderr, "Failed to located HgWeb configuration file."
+		print >>sys.stderr, "Failed to locate HgWeb configuration file."
 		return False
 
 	if parser.has_section('paths'):
@@ -584,7 +588,7 @@
 
 	parser = SafeConfigParser()
 	if not parser.read(settings.HgWebPath + os.sep + 'hgweb.config'):
-		print >>sys.stderr, "Failed to located HgWeb configuration file."
+		print >>sys.stderr, "Failed to locate HgWeb configuration file."
 		return False
 
 	if parser.has_section('paths'):