From 541070be4c3b9eb7b31608a7c2f2676bfe9bc0e7 Mon Sep 17 00:00:00 2001
From: Jonathan Mainguy <jon@soh.re>
Date: Tue, 16 Dec 2014 09:49:13 -0500
Subject: [PATCH] Fixed hostname for rhel5 python 2.4.3

---
 system/hostname.py | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/system/hostname.py b/system/hostname.py
index 48311f07a96..aa562bad399 100644
--- a/system/hostname.py
+++ b/system/hostname.py
@@ -298,13 +298,14 @@ class OpenRCStrategy(GenericStrategy):
 
     def get_permanent_hostname(self):
         try:
-            f = open(self.HOSTNAME_FILE, 'r')
-            for line in f:
-                line = line.strip()
-                if line.startswith('hostname='):
-                    return line[10:].strip('"')
-        except Exception, err:
-            self.module.fail_json(msg="failed to read hostname: %s" % str(err))
+            try:
+                f = open(self.HOSTNAME_FILE, 'r')
+                for line in f:
+                    line = line.strip()
+                    if line.startswith('hostname='):
+                        return line[10:].strip('"')
+            except Exception, err:
+                self.module.fail_json(msg="failed to read hostname: %s" % str(err))
         finally:
             f.close()
 
@@ -312,19 +313,20 @@ class OpenRCStrategy(GenericStrategy):
 
     def set_permanent_hostname(self, name):
         try:
-            f = open(self.HOSTNAME_FILE, 'r')
-            lines = [x.strip() for x in f]
+            try:
+                f = open(self.HOSTNAME_FILE, 'r')
+                lines = [x.strip() for x in f]
 
-            for i, line in enumerate(lines):
-                if line.startswith('hostname='):
-                    lines[i] = 'hostname="%s"' % name
-                    break
-            f.close()
+                for i, line in enumerate(lines):
+                    if line.startswith('hostname='):
+                        lines[i] = 'hostname="%s"' % name
+                        break
+                f.close()
 
-            f = open(self.HOSTNAME_FILE, 'w')
-            f.write('\n'.join(lines) + '\n')
-        except Exception, err:
-            self.module.fail_json(msg="failed to update hostname: %s" % str(err))
+                f = open(self.HOSTNAME_FILE, 'w')
+                f.write('\n'.join(lines) + '\n')
+            except Exception, err:
+                self.module.fail_json(msg="failed to update hostname: %s" % str(err))
         finally:
             f.close()