← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

(jelmer) Don't complain about directory already existing in 'mkdir -p'.
 (Martin Packman)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
23
23
from bzrlib.lazy_import import lazy_import
24
24
lazy_import(globals(), """
25
25
import cStringIO
 
26
import errno
26
27
import sys
27
28
import time
28
29
 
781
782
        for dir in dir_list:
782
783
            wt, relpath = WorkingTree.open_containing(dir)
783
784
            if parents:
784
 
                os.makedirs(dir)
 
785
                try:
 
786
                    os.makedirs(dir)
 
787
                except OSError, e:
 
788
                    if e.errno != errno.EEXIST:
 
789
                        raise
785
790
            else:
786
791
                os.mkdir(dir)
787
792
            add_file(wt, relpath)