cloudutils: fix adding rocky9 host failure due to missing /etc/sysconfig/libvirtd (apache#7779)

weizhouapache · web-flow · commit d89d40595cb1 · 2023-07-28T10:27:44.000+02:00
diff --git a/python/lib/cloudutils/configFileOps.py b/python/lib/cloudutils/configFileOps.py
@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import re
+import os
 import tempfile
 import shutil
 from .utilities import bash
@@ -59,39 +60,42 @@ def getEntry(self, name, separator="="):
             return ""
 
     def save(self):
-        fp = open(self.fileName, "r")
         newLines = []
-        for line  in fp.readlines():
-            matched = False
-            for entry in self.entries:
-                if entry.op == "add":
-                    if entry.separator == "=":
-                        matchString = "^\ *" + entry.name + ".*"
-                    elif entry.separator == " ":
-                        matchString = "^\ *" + entry.name + "\ *" + entry.value
-                else:
-                    if entry.separator == "=":
-                        matchString = "^\ *" + entry.name + "\ *=\ *" + entry.value
+        if os.path.exists(self.fileName) and os.path.isfile(self.fileName):
+            fp = open(self.fileName, "r")
+            for line  in fp.readlines():
+                matched = False
+                for entry in self.entries:
+                    if entry.op == "add":
+                        if entry.separator == "=":
+                            matchString = "^\ *" + entry.name + ".*"
+                        elif entry.separator == " ":
+                            matchString = "^\ *" + entry.name + "\ *" + entry.value
                     else:
-                        matchString = "^\ *" + entry.name + "\ *" + entry.value
-
-                match = re.match(matchString, line)
-                if match is not None:
-                    if entry.op == "add" and entry.separator == "=":
-                        newline = "\n" + entry.name + "=" + entry.value + "\n"
-                        entry.setState("set")
-                        newLines.append(newline)
-                        self.backups.append([line, newline])
-                        matched = True
-                        break
-                    elif entry.op == "rm":
-                        entry.setState("set")
-                        self.backups.append([line, None])
-                        matched = True
-                        break
-
-            if not matched:
-                newLines.append(line)
+                        if entry.separator == "=":
+                            matchString = "^\ *" + entry.name + "\ *=\ *" + entry.value
+                        else:
+                            matchString = "^\ *" + entry.name + "\ *" + entry.value
+
+                    match = re.match(matchString, line)
+                    if match is not None:
+                        if entry.op == "add" and entry.separator == "=":
+                            newline = "\n" + entry.name + "=" + entry.value + "\n"
+                            entry.setState("set")
+                            newLines.append(newline)
+                            self.backups.append([line, newline])
+                            matched = True
+                            break
+                        elif entry.op == "rm":
+                            entry.setState("set")
+                            self.backups.append([line, None])
+                            matched = True
+                            break
+
+                if not matched:
+                    newLines.append(line)
+
+            fp.close()
 
         for entry in self.entries:
             if entry.getState() != "set":
@@ -101,8 +105,6 @@ def save(self):
                     self.backups.append([None, newline])
                     entry.setState("set")
 
-        fp.close()
-
         open(self.fileName, "w").writelines(newLines)
 
     def replace_line(self, startswith,stanza,always_add=False):
