← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/atomicfile.py

  • Committer: Andrew Bennetts
  • Date: 2010-03-11 04:33:41 UTC
  • mfrom: (4797.33.4 2.1)
  • mto: This revision was merged to the branch mainline in revision 5082.
  • Revision ID: andrew.bennetts@canonical.com-20100311043341-rzdik83fnactjsxs
Merge lp:bzr/2.1, including fixes for #496813, #526211, #526353.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/atomicfile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
import os
59
59
                                                osutils.rand_chars(10))
60
60
 
61
61
        self.realfilename = filename
62
 
        
63
 
        flags = os.O_EXCL | os.O_CREAT | os.O_WRONLY
 
62
 
 
63
        flags = os.O_EXCL | os.O_CREAT | os.O_WRONLY | osutils.O_NOINHERIT
64
64
        if mode == 'wb':
65
65
            flags |= osutils.O_BINARY
66
66
        elif mode != 'wt':
70
70
            local_mode = new_mode
71
71
        else:
72
72
            local_mode = 0666
73
 
        
 
73
 
74
74
        # Use a low level fd operation to avoid chmodding later.
75
75
        # This may not succeed, but it should help most of the time
76
76
        self._fd = os.open(self.tmpfilename, flags, local_mode)