Revision 8d14b30d lib/config.py
| b/lib/config.py | ||
|---|---|---|
| 42 | 42 |
from ganeti import constants |
| 43 | 43 |
from ganeti import rpc |
| 44 | 44 |
from ganeti import objects |
| 45 |
from ganeti import serializer |
|
| 45 | 46 |
|
| 46 | 47 |
|
| 47 | 48 |
class ConfigWriter: |
| ... | ... | |
| 502 | 503 |
f = open(self._cfg_file, 'r') |
| 503 | 504 |
try: |
| 504 | 505 |
try: |
| 505 |
data = objects.ConfigData.Load(f)
|
|
| 506 |
data = objects.ConfigData.FromDict(serializer.Load(f.read()))
|
|
| 506 | 507 |
except Exception, err: |
| 507 | 508 |
raise errors.ConfigurationError(err) |
| 508 | 509 |
finally: |
| ... | ... | |
| 560 | 561 |
if destination is None: |
| 561 | 562 |
destination = self._cfg_file |
| 562 | 563 |
self._BumpSerialNo() |
| 564 |
txt = serializer.Dump(self._config_data.ToDict()) |
|
| 563 | 565 |
dir_name, file_name = os.path.split(destination) |
| 564 | 566 |
fd, name = tempfile.mkstemp('.newconfig', file_name, dir_name)
|
| 565 | 567 |
f = os.fdopen(fd, 'w') |
| 566 | 568 |
try: |
| 567 |
self._config_data.Dump(f)
|
|
| 569 |
f.write(txt)
|
|
| 568 | 570 |
os.fsync(f.fileno()) |
| 569 | 571 |
finally: |
| 570 | 572 |
f.close() |
Also available in: Unified diff