Browse Source

* fixed one broken indentation

* fixed a problem with sfdisk waiting for input forever (caused by a previous careless change of me)
master
lars 13 years ago
parent
commit
b7f6afcc67
  1. 12
      plugins/logs/logs.py
  2. 3
      plugins/partition/root_action.py

12
plugins/logs/logs.py

@ -88,12 +88,12 @@ class logs(cryptobox.plugins.base.CryptoBoxPlugin):
def get_status(self):
"""The current status includes the log configuration details.
"""
return "%s:%s:%s" % (
self.cbox.prefs["Log"]["Level"],
self.cbox.prefs["Log"]["Destination"],
self.cbox.prefs["Log"]["Details"])
"""The current status includes the log configuration details.
"""
return "%s:%s:%s" % (
self.cbox.prefs["Log"]["Level"],
self.cbox.prefs["Log"]["Destination"],
self.cbox.prefs["Log"]["Details"])
def get_status(self):

3
plugins/partition/root_action.py

@ -39,9 +39,7 @@ def __partitionDevice(device):
## do not use the "-q" flag, as this spoils the exit code of sfdisk (seems to be a bug)
proc = subprocess.Popen(
shell = False,
stdin = subprocess.PIPE,
stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
args = [
SFDISK_BIN,
"-uM",
@ -55,7 +53,6 @@ def __rereadPartitions(device):
shell = False,
stdin = subprocess.PIPE,
stdout = subprocess.PIPE,
stderr = subprocess.PIPE,
args = [
SFDISK_BIN,
"-R",

Loading…
Cancel
Save