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

dom0/core: make verbose parameter of create_appmenus optional

Browse Source
This commit is contained in:
Marek Marczykowski 2012-08-04 00:37:14 +02:00
parent b7d2667b1d
commit 7677854fd2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom0/qvm-core/qubes.py
View File

@ -1010,7 +1010,7 @@ class QubesVm(object):
print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path) print >> sys.stderr, "--> Creating icon symlink: {0} -> {1}".format(self.icon_path, self.label.icon_path)
os.symlink (self.label.icon_path, self.icon_path) os.symlink (self.label.icon_path, self.icon_path)
def create_appmenus(self, verbose, source_template = None): def create_appmenus(self, verbose=False, source_template = None):
if source_template is None: if source_template is None:
source_template = self.template source_template = self.template
@ -1099,7 +1099,7 @@ class QubesVm(object):
shutil.copy(src_vm.icon_path, self.icon_path) shutil.copy(src_vm.icon_path, self.icon_path)
# Create appmenus # Create appmenus
self.create_appmenus(verbose) self.create_appmenus(verbose=verbose)
def remove_appmenus(self): def remove_appmenus(self):
vmtype = None vmtype = None
@ -1642,7 +1642,7 @@ class QubesTemplateVm(QubesVm):
# Create root-cow.img # Create root-cow.img
self.commit_changes(verbose=verbose) self.commit_changes(verbose=verbose)
def create_appmenus(self, verbose, source_template = None): def create_appmenus(self, verbose=False, source_template = None):
if source_template is None: if source_template is None:
source_template = self.template source_template = self.template
@ -1658,7 +1658,7 @@ class QubesTemplateVm(QubesVm):
self.remove_appmenus() self.remove_appmenus()
def post_rename(self, old_name): def post_rename(self, old_name):
self.create_appmenus(False) self.create_appmenus(verbose=False)
old_dirpath = os.path.dirname(self.dir_path) + '/' + old_name old_dirpath = os.path.dirname(self.dir_path) + '/' + old_name
self.clean_volatile_img = self.clean_volatile_img.replace(old_dirpath, self.dir_path) self.clean_volatile_img = self.clean_volatile_img.replace(old_dirpath, self.dir_path)
@ -1896,7 +1896,7 @@ class QubesNetVm(QubesVm):
self.dir_path + '/' + qubes_whitelisted_appmenus) self.dir_path + '/' + qubes_whitelisted_appmenus)
if not self.internal: if not self.internal:
self.create_appmenus (verbose, source_template=source_template) self.create_appmenus (verbose=verbose, source_template=source_template)
def remove_from_disk(self): def remove_from_disk(self):
if dry_run: if dry_run:
@ -2204,7 +2204,7 @@ class QubesAppVm(QubesVm):
super(QubesAppVm, self).create_on_disk(verbose, source_template=source_template) super(QubesAppVm, self).create_on_disk(verbose, source_template=source_template)
if not self.internal: if not self.internal:
self.create_appmenus (verbose, source_template=source_template) self.create_appmenus (verbose=verbose, source_template=source_template)
def remove_from_disk(self): def remove_from_disk(self):
if dry_run: if dry_run:
@ -2217,7 +2217,7 @@ class QubesAppVm(QubesVm):
self.remove_appmenus() self.remove_appmenus()
def post_rename(self, old_name): def post_rename(self, old_name):
self.create_appmenus(False) self.create_appmenus(verbose=False)
class QubesVmCollection(dict): class QubesVmCollection(dict):