← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 20:27:41 UTC
  • mto: (6437.3.16 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120118202741-c07d47eo2s72ceu9
Raise AlreadyControlDirError.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1475
1475
        # mode from the root directory
1476
1476
        temp_control = lockable_files.LockableFiles(transport,
1477
1477
                            '', lockable_files.TransportLock)
1478
 
        temp_control._transport.mkdir('.bzr',
1479
 
                                      # FIXME: RBC 20060121 don't peek under
1480
 
                                      # the covers
1481
 
                                      mode=temp_control._dir_mode)
 
1478
        try:
 
1479
            temp_control._transport.mkdir('.bzr',
 
1480
                # FIXME: RBC 20060121 don't peek under
 
1481
                # the covers
 
1482
                mode=temp_control._dir_mode)
 
1483
        except errors.FileExists:
 
1484
            raise errors.AlreadyControlDirError(transport.base)
1482
1485
        if sys.platform == 'win32' and isinstance(transport, local.LocalTransport):
1483
1486
            win32utils.set_file_attr_hidden(transport._abspath('.bzr'))
1484
1487
        file_mode = temp_control._file_mode