← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/atomicfile.py

  • Committer: Jelmer Vernooij
  • Date: 2009-01-28 18:42:55 UTC
  • mto: This revision was merged to the branch mainline in revision 3968.
  • Revision ID: jelmer@samba.org-20090128184255-bdmklkvm83ltk191
https://launchpad.net/bugs/321183
Update NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/atomicfile.py
51
51
        global _hostname
52
52
 
53
53
        self._fd = None
54
 
        assert mode in ('wb', 'wt'), \
55
 
            "invalid AtomicFile mode %r" % mode
56
54
 
57
55
        if _hostname is None:
58
 
            _hostname = socket.gethostname()
 
56
            _hostname = osutils.get_host_name()
59
57
 
60
 
        self.tmpfilename = '%s.%d.%s.tmp' % (filename, _pid, _hostname)
 
58
        self.tmpfilename = '%s.%d.%s.%s.tmp' % (filename, _pid, _hostname,
 
59
                                                osutils.rand_chars(10))
61
60
 
62
61
        self.realfilename = filename
63
62
        
64
63
        flags = os.O_EXCL | os.O_CREAT | os.O_WRONLY
65
64
        if mode == 'wb':
66
65
            flags |= osutils.O_BINARY
 
66
        elif mode != 'wt':
 
67
            raise ValueError("invalid AtomicFile mode %r" % mode)
67
68
 
68
69
        if new_mode is not None:
69
70
            local_mode = new_mode