added volume plugin icons

fixed small bugs in error output
fixed some subprocess.communicate mistakes
fixed display bug in partition plugin
This commit is contained in:
lars 2006-11-03 14:27:55 +00:00
parent 2d7b34afaa
commit 5846c3b0f8
15 changed files with 16 additions and 16 deletions

View file

@ -84,7 +84,7 @@ class network(CryptoBoxPlugin.CryptoBoxPlugin):
args = [
root_action_plug.IFCONFIG_BIN,
root_action_plug.IFACE])
(output, error) = proc.communicate()
proc.wait()
if proc.returncode != 0: return (0,0,0,0)
## this regex matches the four numbers of the IP
match = re.search(u'inet [\w]+:(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})\s',output)
@ -110,7 +110,7 @@ class network(CryptoBoxPlugin.CryptoBoxPlugin):
"plugin",
os.path.join(self.pluginDir, "root_action.py"),
ip])
proc.communicate()
proc.wait()
if proc.returncode != 0:
self.cbox.log.warn("failed to change IP address: %s" % ip)
self.cbox.log.warn("error output: %s" % str(proc.stderr.read()))

View file

@ -36,6 +36,6 @@ if __name__ == "__main__":
proc = subprocess.Popen(
shell = False,
args = [IFCONFIG_BIN, IFACE, args[0]])
proc.communicate()
proc.wait()
sys.exit(proc.returncode)