From b7f6afcc671e682a4182a5ba01a9ba19a58b937f Mon Sep 17 00:00:00 2001 From: lars Date: Sat, 13 Jun 2009 02:13:26 +0000 Subject: [PATCH] * fixed one broken indentation * fixed a problem with sfdisk waiting for input forever (caused by a previous careless change of me) --- plugins/logs/logs.py | 12 ++++++------ plugins/partition/root_action.py | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/plugins/logs/logs.py b/plugins/logs/logs.py index a59f91b..49de7c0 100644 --- a/plugins/logs/logs.py +++ b/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): diff --git a/plugins/partition/root_action.py b/plugins/partition/root_action.py index 1d9ed48..a18d15d 100755 --- a/plugins/partition/root_action.py +++ b/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",