As send in before to vernstok BB 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: addfa2e4f10ecd3d851d8d884c85e53374e63217 # timestamp: 2008-07-18 16:54:12 +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-18 12:35:47 +0000 +++ olive/__init__.py 2008-07-18 14:53:20 +0000 @@ -315,7 +315,7 @@ # We're local try: - self.wt, self.wtpath = WorkingTree.open_containing(path) + self.wt, self.wtpath = WorkingTree.open_containing(os.path.realpath(path)) except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree): self.notbranch = True @@ -1318,7 +1318,7 @@ # Try to open the working tree notbranch = False try: - tree1 = WorkingTree.open_containing(path)[0] + tree1 = WorkingTree.open_containing(os.path.realpath(path))[0] except (bzrerrors.NotBranchError, bzrerrors.NoWorkingTree): notbranch = True @@ -1351,7 +1351,7 @@ status = 'unknown' fileid = '' if not notbranch: - filename = tree1.relpath(path + os.sep + item) + filename = tree1.relpath(os.path.realpath(path) + os.sep + item) try: self.wt.lock_read()
# Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWe/JsNIAAZf/gAAUQABRb/// U5AEir////BQA617QNs00UAYlCep6ap6J6mnlNPJpojIaaZDJpkNMg5gEwAmAAEwABMAASQlPVNM ntKNNMj1PU0ADQDQ9ENAOYBMAJgABMAATAAElAjRoTJiZFT/QEaRlP0KbUDT1ND9UpprzwDbtdCd QZCgi9YbtMUYIqeEGuNJfAMZ3P+Zeo8L7JmJ6EfMr+67tmaGiNx2j1jR8dRhj801/t2uOZpPgh64 IZrzATPdos042mUIslS64EtRgiIH3aJ7gR/MeKItA39iohprJCLBdAhwcPSJjNfdTKh2JWXaV0e6 LKbAFOATu+Op0LlLC9BDq/MQ4hyCerZOfAlQMq2PGu6VnKwG8MJ7SIfB7Dj+igV94zS67AYfo8R4 lASlNQ4aKZqE4cRRiXDL/h4XmoipFQoDtYYCcXsNYYFbjVCM5ccphwwpYQKBqWwgDiePJOOCR8kS 2nAtJGF4sTWKcdqHHqLceQOwrVh/tgxaOvMdpgZJ5aPCqe1rwqSMaBm41KS8KSR2k5XSENENHTuq JZVnE8Q0OGd5ps/IuLbDkxWCWSdMYXTAxuGACS0W6h2oHWhWarzhYGnatLwRxex10ibk2eMiQ9TJ i5q652jmfJnWJTrahtMpXlAOswhaxoWgdDEGmhkd+JmkTVxKh4SOeiRMtSfCeIvn1TULpE4Ew06H keYuqRt8eYsDeeASSCGkHxDhzpwuXt0eZ7wxWfMKJ7BAsVKRoAviaoav4bBb8/awawpsPEcOGHU1 daD0IcTrJ4fXyXA+qaFZ6ng45ix8x1UsyvOGSYjcKM3jjS94YaGxUAZTp0LaDWnCbxYYTzzcmmjh lOiiJDe4OUFFRqk4YkHTk1XsbkEsAfahnc0MyrqiBoZg0xPQKZxqwIq0+ds8bgLAKU7nvo/E7eot h2DuLUGKqQp0iKkdUjmHA9tQ/EF9INXKl4PqUF2ykU/BKbkUTPYycYGyl6QSk4sbJXJESGUMhlmg VRlSPJoAejScUIjAjyDuZOX5vXNW2Uvv9wgbNmKmzClWrwjSVGjAs3V1jKFaW7YtNrPVIcDJl3Na 5OiKXW6tidKeQqO7rQgQYMTMmh2SMXxGMwPaq3aqjiAyda6FBH3j5w38/fi8qX01jC5rrJE872Ar +hAiFC0r/6FcFOxUzCcdqxcvsFVARoX2NgH60nwOs2DNxAVGQd0idXXcU1rLTKJM7MP/F3JFOFCQ 78mw0g==
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
