deskbar-applet r2255 - in trunk: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Mon Jul 21 17:15:14 2008
New Revision: 2255
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2255&view=rev

Log:
Catch OSError when calling os.listdir.
(Fixes bug #494922)

Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/files.py

Modified: trunk/deskbar/handlers/files.py
==============================================================================
--- trunk/deskbar/handlers/files.py	(original)
+++ trunk/deskbar/handlers/files.py	Mon Jul 21 17:15:14 2008
@@ -193,10 +193,14 @@
         else:
             return ([], prefix, relative)
 
-    return ([f
-        for f in map(lambda x: join(path, x), os.listdir(path))
-        if my_isfile(f) == is_file and not basename(f).startswith(".") and (start == None or basename(f).startswith(start))
-    ], prefix, relative)
+    try:
+        return ([f
+            for f in map(lambda x: join(path, x), os.listdir(path))
+            if my_isfile(f) == is_file and not basename(f).startswith(".") and (start == None or basename(f).startswith(start))
+        ], prefix, relative)
+    except OSError, e:
+        LOGGER.exception(e)
+        return ([], prefix, relative)
 
 #FIXME: gross hack to detect .savedSearches from nautilus as folders
 def my_isfile(path):