cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rewrite with "try ... finally" instead of "with" statement to support Python 2.4.

Browse source
This commit is contained in:
Hiroaki Nakamura 2013-08-25 07:44:18 +09:00
parent 3b1d7d88b5
commit 4f91238e34
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
library/system/hostname
View file

@ -145,16 +145,22 @@ class DebianStrategy(GenericStrategy):
def get_permanent_hostname(self):
try:
with open(self.HOSTNAME_FILE) as f:
f = open(self.HOSTNAME_FILE)
try:
return f.read().split()
finally:
f.close()
except Exception, err:
self.module.fail_json(msg="failed to read hostname: %s" %
str(err))
def set_permanent_hostname(self, name):
try:
with open(self.HOSTNAME_FILE, 'w+') as f:
f = open(self.HOSTNAME_FILE, 'w+')
try:
f.write("%s\n" % name)
finally:
f.close()
except Exception, err:
self.module.fail_json(msg="failed to update hostname: %s" %
str(err))
@ -180,11 +186,14 @@ class RedHatStrategy(GenericStrategy):
def get_permanent_hostname(self):
try:
with open(self.NETWORK_FILE, 'rb') as f:
f = open(self.NETWORK_FILE, 'rb')
try:
for line in f.readlines():
if line.startswith('HOSTNAME'):
k, v = line.split('=')
return v.strip()
finally:
f.close()
except Exception, err:
self.module.fail_json(msg="failed to read hostname: %s" %
str(err))
@ -192,14 +201,20 @@ class RedHatStrategy(GenericStrategy):
def set_permanent_hostname(self, name):
try:
lines = []
with open(self.NETWORK_FILE, 'rb') as f:
f = open(self.NETWORK_FILE, 'rb')
try:
for line in f.readlines():
if line.startswith('HOSTNAME'):
lines.append("HOSTNAME=%s\n" % name)
else:
lines.append(line)
with open(self.NETWORK_FILE, 'w+') as f:
finally:
f.close()
f = open(self.NETWORK_FILE, 'w+')
try:
f.writelines(lines)
finally:
f.close()
except Exception, err:
self.module.fail_json(msg="failed to update hostname: %s" %
str(err))