Fixes LP118461.
Downside to this patch: the path is replaced with the canonical path which thus also ends up in the adress bar etc. Maybe working with a canonicalised path internally but letting the user see the symlinked path is nicer but requires more than 2 lines added.

Cheers!
Jasper
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: [EMAIL PROTECTED]
# target_branch: file:///home/jasper/Programming/bzr-gtk/trunk/
# testament_sha1: 282206622a267594c29201f8c1d439b109bce0b6
# timestamp: 2008-07-02 20:39:33 +0200
# 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-02 18:39:23 +0000
@@ -307,6 +307,11 @@
                 self.remote = False
                 
                 # We're local
+                # Check if the path contains symlinks and if so, change to canonical path
+                # because self.wt uses canonical path. The path mismatch causes LP118461
+                # and in case of symlinked repository subfolders the bzr data can not be found otherwise
+                if os.path.islink(path):
+                    path = os.path.realpath(path)
                 try:
                     self.wt, self.wtpath = WorkingTree.open_containing(path)
                 except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree):

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWSvrj2sAAZR/gEAUQABZ5///
W5TEAL////BQA+bwBQ0ANQ1MhTQ2poAyHpqAAA0ABoA5gAJkwAJhMEwhgCMADEQKaCeU00DQ08po
AAGjIADmAAmTAAmEwTCGAIwAJJBAT1NpT0yZEMJNqeqMn6ptIGjIw1M4isugLpLCS7UW+S5OQoEi
AmsalQAdcNjFHXAQFIHV+ESPkRBXESqmYDE9ZKJNVvmX5YxJWwoo2rpP4TSlhvd6319MEITUaS1d
c6p/EglBzJ1RX/eIZ2EbBdn7LWqVH49zQmJz8HiOqv57Gxob2tnM4D8LzILRUCjw7gdODopbwzPm
oZXmOGu74I6UC+lztPMZC6hF5gPE1CMxFT3iNpRiRHD/H2dKyiSHm05fNVaglk7Bj9z4l7yw1S2I
bDq8WC6RZqSgcZFtzD4OQqUWiy4CdUUg85BcUheWrXZAcKqaxIH5kjDMV9eoqF7e8ViiMVMr2rWX
NWFhac0mJk23EhWy8Hg8MN5qMizYo0DEBsgwqLZqw8gnakUlw80NbikePJFa5/WybAmQVlEqZqO0
4m0rezNWYWCeMPOGJeYdtVTNZmyYrT9ZWEe86foVsLsxtflQXE2xi7kcDd8hbwvJhJM9ALiXwooe
mJtZpoMvYrpNZjiV6ShFPB8uMbm6jcwmRCAbz13GxLiZz6ToLS4qDWPPKKVFAXlFFOwm8nITvp9l
vaCRA6YlI86jFAdC85kjt1S29IcgkSQdTQiGjXEykwJbc66rbH+IvTkXpqV0FXUw18i4XUioJtSK
pHEbHeQ9+APwvXXoUpH49Rrj0iMGOYcNQpitlwhgt2hegUBTyVToO8I5ZfgK9I5phb+GE8AshELn
niVhQqwMa0+OLamnsbzMzMY9BaFJ+3Pl1FPweGh7obA7wdrFhzP82nFkSc5ZO3Azz8S+rzuTep4F
8xm9ERPliczcoDzzC2rKtdwO+u+irYBpMD5eWpRdafd7v12rEMBaKt/mJ2AMQFgOSrSsVxSByXD3
xmvWiwDtSDuVtyrgJ4fDSRnL4qVWJKkhBgKRy1wCEXEHnteBolApfRQMnMhlt8Z9g7irzFolTvdX
yZLt3kCtGoJh32LtAJDqnXxjtgaaZp/2Y3+Q7WNUbdQa898pDUBWtBTKcdzjeyPclIGq5UCnL2O1
sn1BXTrB4ZesO4KFFkwN0b4O3d8T7pUWDNaeoce7S/xcMTIgWurLiU6gNQCNAIJHojet/t7vukMB
2MYdhjZ68InAEManNsHqkKq2PBlFk9xcKPnwDjZC0trLFUHoYgNPKDAc4hmArrF/Pg4CZmWRUKzA
uzg2Gygnkh/i7kinChIFfXHtYA==

Attachment: 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

Reply via email to