← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/upgrade.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/upgrade.py
40
40
            self.pb.finished()
41
41
 
42
42
    def convert(self):
43
 
        branch = self.bzrdir.open_branch()
44
 
        if branch.bzrdir.root_transport.base != self.bzrdir.root_transport.base:
45
 
            self.pb.note("This is a checkout. The branch (%s) needs to be "
46
 
                         "upgraded separately.",
47
 
                         branch.bzrdir.root_transport.base)
 
43
        try:
 
44
            branch = self.bzrdir.open_branch()
 
45
            if branch.bzrdir.root_transport.base != \
 
46
                self.bzrdir.root_transport.base:
 
47
                self.pb.note("This is a checkout. The branch (%s) needs to be "
 
48
                             "upgraded separately.",
 
49
                             branch.bzrdir.root_transport.base)
 
50
        except errors.NotBranchError:
 
51
            pass
48
52
        if not self.bzrdir.needs_format_conversion(self.format):
49
53
            raise errors.UpToDateFormat(self.bzrdir._format)
50
54
        if not self.bzrdir.can_convert_format():