← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Martin Packman
  • Date: 2011-11-29 16:14:12 UTC
  • mto: This revision was merged to the branch mainline in revision 6327.
  • Revision ID: martin.packman@canonical.com-20111129161412-mx4yu5mg6xsaty46
Require the dulwich package when using py2exe with the git plugin enabled

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
255
255
            if mode is not None and mode != S_IMODE(st.st_mode):
256
256
                # Because of umask, we may still need to chmod the file.
257
257
                # But in the general case, we won't have to
258
 
                osutils.chmod_if_possible(abspath, mode)
 
258
                os.chmod(abspath, mode)
259
259
            writer(fd)
260
260
        finally:
261
261
            os.close(fd)
314
314
            local_mode = mode
315
315
        try:
316
316
            os.mkdir(abspath, local_mode)
 
317
            if mode is not None:
 
318
                # It is probably faster to just do the chmod, rather than
 
319
                # doing a stat, and then trying to compare
 
320
                os.chmod(abspath, mode)
317
321
        except (IOError, OSError),e:
318
322
            self._translate_error(e, abspath)
319
 
        if mode is not None:
320
 
            try:
321
 
                osutils.chmod_if_possible(abspath, mode)
322
 
            except (IOError, OSError), e:
323
 
                self._translate_error(e, abspath)
324
323
 
325
324
    def mkdir(self, relpath, mode=None):
326
325
        """Create a directory at the given path."""
358
357
        if mode is not None and mode != S_IMODE(st.st_mode):
359
358
            # Because of umask, we may still need to chmod the file.
360
359
            # But in the general case, we won't have to
361
 
            osutils.chmod_if_possible(file_abspath, mode)
 
360
            os.chmod(file_abspath, mode)
362
361
        return st.st_size
363
362
 
364
363
    def append_file(self, relpath, f, mode=None):
457
456
                    otherpath = other._abspath(path)
458
457
                    shutil.copy(mypath, otherpath)
459
458
                    if mode is not None:
460
 
                        osutils.chmod_if_possible(otherpath, mode)
 
459
                        os.chmod(otherpath, mode)
461
460
                except (IOError, OSError),e:
462
461
                    self._translate_error(e, path)
463
462
                count += 1