anaconda: fixes for upgraded anaconda (failed conflict resolution)

anaconda/pyanaconda/network.py

@@ -942,18 +942,6 @@ def write_hostname(rootpath, ksdata, overwrite=False):
 
     return True
 
-def write_sysconfig_network(rootpath, ksdata, overwrite=False):
-
-    cfgfile = os.path.normpath(rootpath + networkConfFile)
-    if (os.path.isfile(cfgfile) and not overwrite):
-        return False
-
-    f = open(cfgfile, "w")
-    f.write("# Generated by anaconda\n")
-    f.write("NETWORKING=no\n")
-    f.close()
-    return True
-
 def disableIPV6(rootpath):
     cfgfile = os.path.normpath(rootpath + ipv6ConfFile)
     if ('noipv6' in flags.cmdline
@@ -1020,6 +1008,17 @@ def usedByRootOnISCSI(iface, storage):
 
     return False
 
+def write_sysconfig_network(rootpath, overwrite=False):
+
+    cfgfile = os.path.normpath(rootpath + networkConfFile)
+    if (os.path.isfile(cfgfile) and not overwrite):
+        return False
+
+    with open(cfgfile, "w") as f:
+        f.write("# Created by anaconda\n")
+        f.write("NETWORKING=no\n")
+    return True
+
 def write_network_config(storage, ksdata, instClass, rootpath):
     write_hostname(rootpath, ksdata, overwrite=flags.livecdInstall)
     set_hostname(ksdata.network.hostname)
@@ -1034,7 +1033,7 @@ def update_hostname_data(ksdata, hostname=None):
     if not hostname:
         # Default to 'dom0' in Qubes
         hostname = 'dom0'
-    log.debug("updating hostname %s" % hostname)
+    log.debug("updating hostname %s", hostname)
     hostname_found = False
     for nd in ksdata.network.network:
         if nd.hostname:

anaconda/pyanaconda/ui/gui/spokes/password.py

@@ -124,8 +124,6 @@ class PasswordSpoke(FirstbootSpokeMixIn, NormalSpoke):
 
     @property
     def status(self):
-        if self._error:
-            return _("Error setting root password")
         if self.data.rootpw.lock:
             return _("Root account is disabled")
         elif self.data.rootpw.password: