~ubuntu-branches/ubuntu/maverick/bzr-git/maverick

« back to all changes in this revision

Viewing changes to workingtree.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2010-03-18 16:09:25 UTC
  • mfrom: (1.1.9 upstream) (8.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20100318160925-p96lipgudc5iw3u5
Tags: 0.5.0-1
* New upstream release.
 + Fixes breakage with newer versions of Python 2.6.
* Bump standards version to 3.8.4.
* Switch to dpkg-source 3.0 (quilt) format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
    osutils,
37
37
    transport,
38
38
    tree,
39
 
    urlutils,
40
39
    workingtree,
41
40
    )
42
41
from bzrlib.decorators import (
67
66
        self._branch = branch
68
67
        self._transport = bzrdir.transport
69
68
 
70
 
        self.controldir = urlutils.join(self.repository._git._controldir, 'bzr')
 
69
        self.controldir = self.bzrdir.transport.local_abspath('bzr')
71
70
 
72
71
        try:
73
72
            os.makedirs(self.controldir)