← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/atomicfile.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/atomicfile.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
17
18
 
18
19
import os
19
20
 
78
79
            # the common case is that we won't, though.
79
80
            st = os.fstat(self._fd)
80
81
            if stat.S_IMODE(st.st_mode) != new_mode:
81
 
                os.chmod(self.tmpfilename, new_mode)
 
82
                osutils.chmod_if_possible(self.tmpfilename, new_mode)
82
83
 
83
84
    def __repr__(self):
84
85
        return '%s(%r)' % (self.__class__.__name__,