Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-tools/qvm-run: do not echo empty line, remove unneeded imports

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-11-10 02:25:27 +01:00
parent ac155705d1
commit 19d064ca66
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qvm-tools/qvm-run
View File

@ -27,10 +27,6 @@ from qubes.qubes import QubesException
from qubes.notify import notify_error_qubes_manager from qubes.notify import notify_error_qubes_manager
from qubes.notify import tray_notify,tray_notify_error,tray_notify_init from qubes.notify import tray_notify,tray_notify_error,tray_notify_init
from optparse import OptionParser from optparse import OptionParser
import subprocess
import socket
import errno
import time
import sys import sys
import os import os
import os.path import os.path
@ -68,7 +64,7 @@ def vm_run_cmd(vm, cmd, options):
gui = options.gui, filter_esc = options.filter_esc) gui = options.gui, filter_esc = options.filter_esc)
except QubesException as err: except QubesException as err:
if options.passio and options.color_output is not None: if options.passio and options.color_output is not None:
print "\033[0m", sys.stdout.write("\033[0m")
if options.tray: if options.tray:
tray_notify_error(str(err)) tray_notify_error(str(err))
notify_error_qubes_manager(vm.name, str(err)) notify_error_qubes_manager(vm.name, str(err))
@ -76,7 +72,7 @@ def vm_run_cmd(vm, cmd, options):
return 1 return 1
finally: finally:
if options.passio and options.color_output is not None: if options.passio and options.color_output is not None:
print "\033[0m", sys.stdout.write("\033[0m")
def main(): def main():
usage = "usage: %prog [options] [<vm-name>] [<cmd>]" usage = "usage: %prog [options] [<vm-name>] [<cmd>]"