QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

appmenus: mute output when verbose=False

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2014-09-18 07:46:00 +02:00
parent a0eda3023f
commit 40178a161e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
appmenus-scripts/qubes-core-appmenus.py
View File

@ -77,13 +77,23 @@ def QubesVm_appmenus_create(self, verbose=False, source_template = None):
vmtype = 'appvms' vmtype = 'appvms'
try: try:
msgoutput = None if verbose else open(os.devnull, 'w')
if source_template is not None: if source_template is not None:
subprocess.check_call ([system_path["appmenu_create_cmd"], source_template.appmenus_templates_dir, self.name, vmtype, self.label.icon]) subprocess.check_call([system_path["appmenu_create_cmd"],
source_template.appmenus_templates_dir,
self.name, vmtype, self.label.icon],
stdout=msgoutput, stderr=msgoutput)
elif self.appmenus_templates_dir is not None: elif self.appmenus_templates_dir is not None:
subprocess.check_call ([system_path["appmenu_create_cmd"], self.appmenus_templates_dir, self.name, vmtype, self.label.icon]) subprocess.check_call ([system_path["appmenu_create_cmd"],
self.appmenus_templates_dir, self.name,
vmtype, self.label.icon],
stdout=msgoutput, stderr=msgoutput)
else: else:
# Only add apps to menu # Only add apps to menu
subprocess.check_call ([system_path["appmenu_create_cmd"], "none", self.name, vmtype, self.label.icon]) subprocess.check_call ([system_path["appmenu_create_cmd"],
"none", self.name, vmtype,
self.label.icon],
stdout=msgoutput, stderr=msgoutput)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
print >> sys.stderr, "Ooops, there was a problem creating appmenus for {0} VM!".format (self.name) print >> sys.stderr, "Ooops, there was a problem creating appmenus for {0} VM!".format (self.name)
@ -95,7 +105,8 @@ def QubesVm_appmenus_remove(self):
vmtype = 'vm-templates' vmtype = 'vm-templates'
else: else:
vmtype = 'appvms' vmtype = 'appvms'
subprocess.check_call ([system_path["appmenu_remove_cmd"], self.name, vmtype]) subprocess.check_call ([system_path["appmenu_remove_cmd"], self.name,
vmtype], stderr=open(os.devnull, 'w'))
def QubesVm_appicons_create(self, srcdir=None): def QubesVm_appicons_create(self, srcdir=None):
if srcdir is None: if srcdir is None: