[Pkg-bazaar-commits] ./bzr-gtk/unstable r437: Merge with trunk

[Aaron Bentley]

------------------------------------------------------------
revno: 437
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr-gtk
timestamp: Tue 2008-03-04 17:18:43 +0000
message:
  Merge with trunk
modified:
  olive/__init__.py
    ------------------------------------------------------------
    revno: 423.12.2
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: bug125932
    timestamp: Tue 2008-03-04 15:18:03 +0100
    message:
      Some missing bits completed. Bad symlinks are ommitted on refresh as well.
    modified:
      olive/__init__.py
    ------------------------------------------------------------
    revno: 435.1.1
    committer: Szilveszter Farkas (Phanatic) <szilveszter.farkas at gmail.com>
    branch nick: trunk
    timestamp: Tue 2008-03-04 15:19:44 +0100
    message:
      Merge some more fixes that were left out from the original bundle.
    modified:
      olive/__init__.py
-------------- next part --------------
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2008-03-03 17:46:23 +0000
+++ b/olive/__init__.py	2008-03-04 14:18:03 +0000
@@ -1270,7 +1270,13 @@
                 
             # Add'em to the ListStore
             for item in dirs:
-                statinfo = os.stat(self.path + os.sep + item)
+                try:
+                    statinfo = os.stat(self.path + os.sep + item)
+                except OSError, e:
+                    if e.errno == 40:
+                        continue
+                    else:
+                        raise
                 liststore.append([gtk.STOCK_DIRECTORY,
                                   True,
                                   item,
@@ -1333,7 +1339,13 @@
                 else:
                     st = _('unknown')
                 
-                statinfo = os.stat(self.path + os.sep + item)
+                try:
+                    statinfo = os.stat(self.path + os.sep + item)
+                except OSError, e:
+                    if e.errno == 40:
+                        continue
+                    else:
+                        raise
                 liststore.append([gtk.STOCK_FILE,
                                   False,
                                   item,