* fixed one broken indentation

* fixed a problem with sfdisk waiting for input forever (caused by a previous careless change of me)
This commit is contained in:
lars 2009-06-13 02:13:26 +00:00
parent 38843516fa
commit b7f6afcc67
2 changed files with 6 additions and 9 deletions

View File

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

View File

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