Fix for LP125144.Olive raises an error and stops when it tries to add a broken symlink to the filelist. Fix: Test for broken symlink error code and continue on encounter, e.g. not adding the file to the filelist.
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: 1cffef8fcc461e803e2c94d53163acff071abb77 # timestamp: 2008-07-13 18:46:46 +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-13 16:45:25 +0000 @@ -1003,6 +1003,8 @@ except OSError, e: if e.errno == 40: continue + elif e.errno == 2: + continue else: raise liststore.append([ gtk.STOCK_DIRECTORY, @@ -1070,6 +1072,8 @@ except OSError, e: if e.errno == 40: continue + elif e.errno == 2: + continue else: raise liststore.append([gtk.STOCK_FILE, @@ -1308,6 +1312,8 @@ except OSError, e: if e.errno == 40: continue + elif e.errno == 2: + continue else: raise liststore.append([gtk.STOCK_DIRECTORY, @@ -1377,6 +1383,8 @@ except OSError, e: if e.errno == 40: continue + elif e.errno == 2: + continue else: raise liststore.append([gtk.STOCK_FILE, # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbIjyUgAAcr/gAAURABRY/// U5RAAL////BQA95TtaitAAYSlT9KYm1DJo00ANBoANGgAGAAAAAAAAAAASQknkp6m2pPU9QyAAND QAABgAAAAAAAAAAEkphBoTJpk0VPYI1TwTFPU8CnqN6pbft7wb21kM2NgwxBYjBS2WnJz0jPZNbN XW6E2kAIge1eo8K2ZkP9D7fFiTaWUohXxDQ9nUOjqD6K3ELkvyi195+mDBqg+1QoWvHqkV+kpgcp QyIKyGCmC+uojwNZ85Wl4UCfnboEaGoDKdL4D4XZpvL+Gu+X68hcKEsWNOGDtl5EmTMIeOOIRnMT cZE5IYMBD3BAjQQOUJfQpnLVDFHRMkwcWHtfJsXHiIScU4lMjHiK2h3IWNUSeaIRorSQlEvCPwVB 6wOyFuIlnKhkSmWHUGQHCSuGcyjARhOOMGwrmdI3uJsGucFZImKhNcnmI8gcErCytjaMjWIXHDrK Kbq+Ztl4ZzC0tlMxHHNZ8cxcnF4mFuJRk1i1FR2A2DpApNgWwcqXMUrs/OhBlc04i4fIYupwVGo4 mwvubSpWFAmN8hxiTEIG+w1kdgfxTOV2MmLE6knCHUVfot75heTLwDbOTl7Uq5pghjgDh6DTtRR4 ajRItDUlF7Jj1bNdN/nUrk+1qbE+CcDrOeiJxDqNhAHHWbDnAxSzLO0sHhndRGBCkDjtQTz7SbKJ pmHiMdDGXdlkaiMxTLhyIpJUlZ/3WY5tGb1pKk1fwfJdR2niXbBTFicm3FeNOhHIwK5HpqDoMGfT UE3mt4xZf2bl6j/U50vDv4HH57bW0/ZyOgVe2ufJMjOzVfqDx9wiLeUhBZ1ANQnQDPE3m42kD77N 5JgxOTrQ2hUKzzOR+f1f1tmFc3vcLL/DMuL/dECQbjNOMjgEmnU5/sQ2RnvAsArXVT+7Iu8dS+Rc xYBkS54A9wFKURVLeetCXJe/ENI/kBxeHGu1QSmCrZIq0kp8CUXzTTJZqFjwf/MXH4yHJWg+AMns hks8QxCK1pZtEDumB6U+4JBm5dz1Y2rT5Nr15L+xROqkVWuihMSiFq0CtMqs5jNkeCTwanfEVfLC 1k6gKZ7QcFgVdK43iwFSKhgZc/E9EowqGas6BmpG4BoLVOHuDKKMtXdGHDRzeVrsvLmtkT4axxOE 4Msp3uUGVPBweF4QCg3Wypgpw8zSB9OPQdtDIupNqUFdpJ07jbAryqVCcf4u5IpwoSFkR5KQ
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
