Qubes/manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/qubes-manager

Browse Source
This commit is contained in:
Agnieszka Kostrzewa 2012-04-25 13:15:29 +02:00
commit 26b958e1d9
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubesmanager/main.py
View File

@ -1305,7 +1305,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
def do_update_vm(self, vm, thread_monitor): def do_update_vm(self, vm, thread_monitor):
try: try:
if vm.qid == 0: if vm.qid == 0:
subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"]) subprocess.check_call (["/usr/bin/qubes-dom0-update", "--gui"])
else: else:
vm.run("user:gpk-update-viewer", verbose=False, autostart=True) vm.run("user:gpk-update-viewer", verbose=False, autostart=True)
except Exception as ex: except Exception as ex:

7
qubesmanager/settings.py
View File

@ -379,9 +379,14 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog):
self.config_path.setText(self.vm.conf_file) self.config_path.setText(self.vm.conf_file)
if self.vm.template is not None: if self.vm.template is not None:
self.root_img_path.setText(self.vm.template.root_img) self.root_img_path.setText(self.vm.template.root_img)
elif self.vm.root_img is not None:
self.root_img_path.setText(self.vm.root_img)
else: else:
self.root_img_path.setText("n/a") self.root_img_path.setText("n/a")
self.volatile_img_path.setText(self.vm.volatile_img) if self.vm.volatile_img is not None:
self.volatile_img_path.setText(self.vm.volatile_img)
else:
self.volatile_img_path.setText('n/a')
self.private_img_path.setText(self.vm.private_img) self.private_img_path.setText(self.vm.private_img)

2
version
View File

@ -1 +1 @@
1.2.10 1.2.11