conduit r1406 - in trunk: . conduit/modules/FileModule

[jstowers svn gnome org]

Author: jstowers
Date: Fri Apr  4 09:57:58 2008
New Revision: 1406
URL: http://svn.gnome.org/viewvc/conduit?rev=1406&view=rev

Log:
2008-04-04  John Stowers  <john stowers gmail com>

	* conduit/modules/FileModule/FileModule.py: Be more robust when reading
	the group file.



Modified:
   trunk/ChangeLog
   trunk/conduit/modules/FileModule/FileModule.py

Modified: trunk/conduit/modules/FileModule/FileModule.py
==============================================================================
--- trunk/conduit/modules/FileModule/FileModule.py	(original)
+++ trunk/conduit/modules/FileModule/FileModule.py	Fri Apr  4 09:57:58 2008
@@ -177,7 +177,12 @@
                 #which describe the folder sync groups, and their names,
                 mountUri = "file://%s" % mount
                 
-                groups = FileDataProvider.read_removable_volume_group_file(mountUri)
+                try:
+                    groups = FileDataProvider.read_removable_volume_group_file(mountUri)
+                except Exception, e:
+                    log.warn("Error reading volume group file: %s" % e)
+                    groups = ()
+                    
                 if len(groups) > 0:
                     self._volumes[udi] = []
                     for relativeUri,name in groups: