Rev 4849: (vila) Minimal fix for bug #525571 to ease backport to launchpad. (Vincent in file:///home/pqm/archives/thelove/bzr/2.1/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.1/

------------------------------------------------------------
revno: 4849 [merge]
revision-id: pqm at pqm.ubuntu.com-20100702165222-fpaz3hd04sh5dze2
parent: pqm at pqm.ubuntu.com-20100702162122-nh3z4l1omh7h0li3
parent: v.ladeuil+lp at free.fr-20100702160851-c3pg24xa9vwg75yz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.1
timestamp: Fri 2010-07-02 17:52:22 +0100
message:
  (vila) Minimal fix for bug #525571 to ease backport to launchpad. (Vincent
   Ladeuil)
modified:
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-07-02 14:39:06 +0000
+++ b/bzrlib/config.py	2010-07-02 16:08:51 +0000
@@ -511,10 +511,8 @@
         self._write_config_file()
 
     def _write_config_file(self):
-        f = StringIO()
-        self._get_parser().write(f)
         atomic_file = atomicfile.AtomicFile(self._get_filename())
-        atomic_file.write(f.getvalue())
+        self._get_parser().write(atomic_file)
         atomic_file.commit()
         atomic_file.close()
 
@@ -657,10 +655,8 @@
         self._get_parser()[location][option]=value
         # the allowed values of store match the config policies
         self._set_option_policy(location, option, store)
-        f = StringIO()
-        self._get_parser().write(f)
         atomic_file = atomicfile.AtomicFile(self._get_filename())
-        atomic_file.write(f.getvalue())
+        self._get_parser().write(atomic_file)
         atomic_file.commit()
         atomic_file.close()