[jhbuild] Never generate copydir location with srcdir property

[Frederic Peters <fpeters src gnome org>]

commit d9404ebd2c45e5d374e5c74272c962c39716df75
Author: Dirk Wallenstein <halsmit t-online de>
Date:   Thu Oct 21 14:18:42 2010 +0200

    Never generate copydir location with srcdir property
    
    This syncs the behavior to the other branch types. It is the same as
    previously, except that it does never generate a copy-dir location.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=632859

 jhbuild/versioncontrol/bzr.py |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/jhbuild/versioncontrol/bzr.py b/jhbuild/versioncontrol/bzr.py
index b5f7d21..4552668 100644
--- a/jhbuild/versioncontrol/bzr.py
+++ b/jhbuild/versioncontrol/bzr.py
@@ -123,8 +123,10 @@ class BzrBranch(Branch):
     revspec = property(get_revspec, set_revspec)
 
     def srcdir(self):
-        return Branch.get_checkoutdir(self)
-
+        if self.checkoutdir:
+            return os.path.join(self.checkoutroot, self.checkoutdir)
+        else:
+            return os.path.join(self.checkoutroot, self.get_module_basename())
     srcdir = property(srcdir)
 
     def get_module_basename(self):