Courtesey of pylint.
---
booty/x86.py | 9 +++------
kickstart.py | 2 +-
storage/partitioning.py | 4 ++--
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/booty/x86.py b/booty/x86.py
index bc0dcf6..14da9a1 100644
--- a/booty/x86.py
+++ b/booty/x86.py
@@ -200,7 +200,7 @@ class x86BootloaderInfo(efiBootloaderInfo):
return self.runGrubInstall(instRoot, bootDev.name, cmds, cfPath)
def writeGrub(self, instRoot, bl, kernelList, chainList,
- defaultDev, justConfigFile, upgrade=False):
+ defaultDev, upgrade=False):
rootDev = self.storage.rootDevice
grubTarget = bl.getDevice()
@@ -225,14 +225,11 @@ class x86BootloaderInfo(efiBootloaderInfo):
usedDevs.update(self.getPhysicalDevices(bootDev.name))
usedDevs.update([dev for (label, longlabel, dev) in chainList if longlabel])
- if not justConfigFile or not upgrade:
+ if not upgrade:
self.writeDeviceMap(instRoot, usedDevs, upgrade)
self.writeSysconfig(instRoot, grubTarget, upgrade)
- if not justConfigFile:
- return self.installGrub(instRoot, bootDev, grubTarget, grubPath, cfPath)
-
- return 0
+ return self.installGrub(instRoot, bootDev, grubTarget, grubPath, cfPath)
def writeGrubConf(self, instRoot, bootDev, rootDev, defaultDev, kernelList,
chainList, grubTarget, grubPath, cfPath):
diff --git a/kickstart.py b/kickstart.py
index 38ae1ea..355603b 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -165,7 +165,7 @@ def getEscrowCertificate(anaconda, url):
anaconda.intf.kickstartErrorWindow(msg)
sys.exit(1)
else:
- stderrLog.critical(msg)
+ stdoutLog.critical(msg)
sys.exit(1)
try:
diff --git a/storage/partitioning.py b/storage/partitioning.py
index b59f958..3bd1f78 100644
--- a/storage/partitioning.py
+++ b/storage/partitioning.py
@@ -1149,8 +1149,8 @@ class Request(object):
def __str__(self):
s = ("%(type)s instance --\n"
- "id = %(id)s name = %(name)s growable = %(growable)\n"
- "base = %(base)d growth = %(grow)d max_grow = %(max_grow)d\n"
+ "id = %(id)s name = %(name)s growable = %(growable)s\n"
+ "base = %(base)d growth = %(growth)d max_grow = %(max_grow)d\n"
"done = %(done)s" %
{"type": self.__class__.__name__, "id": self.id,
"name": self.partition.name, "growable": self.growable,
--
1.7.0.1
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
