You mean like this? :) And now I _will_ go to bed. Jasper
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [EMAIL PROTECTED] # target_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # testament_sha1: e3bfd3569c6c1c141a8816ba12dbd2a54eb83b64 # timestamp: 2008-07-15 03:02:57 +0200 # source_branch: https://code.launchpad.net/~bzr-gtk/bzr-gtk/trunk # base_revision_id: [EMAIL PROTECTED] # # Begin patch === modified file 'olive/__init__.py' --- olive/__init__.py 2008-07-01 21:56:25 +0000 +++ olive/__init__.py 2008-07-15 01:02:52 +0000 @@ -19,6 +19,7 @@ import os import sys import time +import errno # gettext support import gettext @@ -238,6 +239,9 @@ self.combobox_drive.show() self.gen_hard_selector() + # Acceptable errors when loading files/folders in the treeviews + self.acceptable_errors = (errno.ENOENT, errno.ELOOP) + self._load_left() # Apply menu state @@ -1001,7 +1005,7 @@ try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: - if e.errno == 40: + if e.errno in self.acceptable_errors: continue else: raise @@ -1068,7 +1072,7 @@ try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: - if e.errno == 40: + if e.errno in self.acceptable_errors: continue else: raise @@ -1306,7 +1310,7 @@ try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: - if e.errno == 40: + if e.errno in self.acceptable_errors: continue else: raise @@ -1375,7 +1379,7 @@ try: statinfo = os.stat(self.path + os.sep + item) except OSError, e: - if e.errno == 40: + if e.errno in self.acceptable_errors: continue else: raise
# Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWczNSiUAA5h/gAQURABZZ/// c5XcAL////BgBnw+oBQACgAAA5gEwEyMAIxMTCYTBDTE0wOYBMBMjACMTEwmEwQ0xNMDmATATIwA jExMJhMENMTTAShTEaieQ00TJ5JpoAAaA0ZGQaDmATATIwAjExMJhMENMTTAKlEAjRoE0BNNT0ym aFM0EyaabKMj1HpdvVU5DPWqqqrpi4asmiLYVY9bh5aGGGIiMColwUrloirh6IhZkgzTqOI3pHUD nQe6NKAiTIiajNHEHiSiiqAqg/QgbHEBUnnYapmVJFnlBh8IQcWwhRLMXJLs1+2QLRgwhZsNt5tG 2o9wH8eVP3puw+faza9potbKLptqbaFLS2iwpQzzwt3csO70lYxbFGNS4oVRaSTHYCOc8wFD0EOL WZg0R00ms+bocTmag5Jc8HFySW8a9rsjWO7Uh8z5p6dXM6OPj39Gda1w/D8ZHHvc84mukc6KWc1l 7evlUooRa5pa+0wxLTmxThzZM1JLVLSLFiWRFexQqxLf5Rkxe621oNKFKKy0pqsjJM1SrHKp5OHr W209m3m13Go4o/QqfkWnM1TkxxTW/PlFVtblyxF3uu4I1OpNy7M6nQngi9Ge5vK54b7iiW0oqiXO tKG1RsbzCRqL59m5KTRcxLpLFkosrhbfQoKIkhK8eOSdaqGkoZVHF8nHkSBgMpWJEJ5jp1Vas7xd wYM1902oo5Ts8KzBoXsXehkzXN/LClc6ZsqMZJalC9x2X2os3IxwWzf1Ka29dHBl8W5mzX5LXSyV Wt7BL91M79MOPSyXraFC0uoqjc0uYNdNzYrqVjW1r3kbFjbW7VJG2l3I4r7WFM6KLOKlTNPJqfy+ rLDKw5UssI5K1pg2tCyxTWvVcrHOatboUcOng0nYdhowyrujc273ml6Knhub1rrVVTHqYM3gxjtZ MVHqMSmNtFspoypKGiWZGMl3eaa/vNPgqT5KR6/ietv1GRXiq1LKyuuilFlJidz7T0c1jFVZRios tUpkepDG3bKJSftTsfTheyX2KPp9L1Ft637k4pi3qM5NyWrksksbvbwvpSeZ63cuHa+1coq87mCd SHOPLuae/3u5vMZPbrQsOMZrmGon0f1GzzR6eLk9HwanN1tRxd3w6WCbULXh71fCx9oa21tZIWM1 r52p/20SklMZYsGPMnKAWlFGRbhpNR+VCLgLfYZzDviOx0rVVHCLk/BV7G/hnyRqe1Rt3bSvn2H1 KF07fT6usWujj5KqvYWNqxv6HveUfmW/ZPSlM5LZNPYt3/v79KTROh8I+jzfU2Nn69fa1qpRH10T vcOni6Td3fIU/r8q0MckdfsNDUnH1ergFV+iXqi5jG98liVeTyPF7TxMj+Ho6I0+6qcD0WuJ7DZI 3L/cek/pvcXQp3jq252/rwSXfM6E7Tg4u9F5bsPc9zwP4TukwNnZJ7ZK311pqnswO9gxc1tEm0NE 8WTft/9TBb9/XP2R8UYnZNb4cZLbJDJC9GpO493nkhglPb6ikUnnH6qHKXPbIea06/NuX74whYbH czNbomLBzLs1LVala1VeaWVJsi9tvkte+9ZPFSFiH5JukXLyiXURRHLuojrOOB2oXdztsYwfFUvk X+Em09VkWp6lyaYVdTo+6jtdrsTmi83tSOdmfVkyikzvTE3pojRNxcz66utRO9C2SjU9a8mx4uTR RLGJlhnoWptka/q2YcEXJyRqgxpRKFKJROm150+K78ULDGxmUU2H1P64HbGh3hRglvSyP0KSYSW0 61fRfhtw8G94rzYnk4nFOKqmtsMVOewqYnhhJVOtjcsi+iYa3janw4l5q1PsbrNuqXpifI5QfisP cWORv6SlmU7kKppvcpXFLFko4I3TfIymKx/8XckU4UJDMzUolA==
signature.asc
Description: OpenPGP digital signature
-- bzr-gtk mailing list [email protected] Modify settings or unsubscribe at: https://lists.canonical.com/mailman/listinfo/bzr-gtk
