[blivet:master 2/6] Fixed some questionable indentation
mulhern
amulhern at redhat.com
Fri Mar 21 20:17:11 UTC 2014
From: David Shea <dshea at redhat.com>
Signed-off-by: mulhern <amulhern at redhat.com>
---
blivet/__init__.py | 6 +++---
blivet/devicelibs/lvm.py | 4 ++--
blivet/devicetree.py | 2 +-
blivet/formats/prepboot.py | 10 +++++-----
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/blivet/__init__.py b/blivet/__init__.py
index 00c5143..4372b9d 100644
--- a/blivet/__init__.py
+++ b/blivet/__init__.py
@@ -347,11 +347,11 @@ class Blivet(object):
# GPT partitions with the boot flag)
if dev.disk.format.labelType == "gpt" and \
dev.format.type not in ["efi", "macefi"]:
- skip = True
+ skip = True
if skip:
- log.info("Skipping %s", dev.name)
- continue
+ log.info("Skipping %s", dev.name)
+ continue
# hfs+ partitions on gpt can't be marked bootable via parted
if dev.disk.format.partedDisk.type != "gpt" or \
diff --git a/blivet/devicelibs/lvm.py b/blivet/devicelibs/lvm.py
index 024108d..61f64eb 100644
--- a/blivet/devicelibs/lvm.py
+++ b/blivet/devicelibs/lvm.py
@@ -128,8 +128,8 @@ def getPossiblePhysicalExtents():
possiblePE = []
curpe = Size(spec="1 KiB")
while curpe <= Size(spec="16 GiB"):
- possiblePE.append(curpe)
- curpe = curpe * 2
+ possiblePE.append(curpe)
+ curpe = curpe * 2
return possiblePE
diff --git a/blivet/devicetree.py b/blivet/devicetree.py
index d75549e..3fe71ba 100644
--- a/blivet/devicetree.py
+++ b/blivet/devicetree.py
@@ -270,7 +270,7 @@ class DeviceTree(object):
# it's likely that a previous format destroy action
# triggered setup of an lvm or md device.
for dep in self.getDependentDevices(action.device.disk):
- dep.teardown(recursive=True)
+ dep.teardown(recursive=True)
action.execute()
udev_settle()
diff --git a/blivet/formats/prepboot.py b/blivet/formats/prepboot.py
index e22b420..fdb8588 100644
--- a/blivet/formats/prepboot.py
+++ b/blivet/formats/prepboot.py
@@ -82,12 +82,12 @@ class PPCPRePBoot(DeviceFormat):
buf = '\0' * 1024 * 1024
while length > 0:
if length >= len(buf):
- os.write(fd, buf)
- length -= len(buf)
+ os.write(fd, buf)
+ length -= len(buf)
else:
- buf = '\0' * length
- os.write(fd, buf)
- length = 0
+ buf = '\0' * length
+ os.write(fd, buf)
+ length = 0
os.close(fd)
except OSError as e:
log.error("error zeroing out %s: %s", self.device, e)
--
1.8.3.1
More information about the anaconda-patches
mailing list