From df8300f54bd05d9e97cdd99f1a1487972ccc5f85 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 10 Feb 2012 20:49:16 +0100 Subject: [PATCH 1/7] Use vm.run instead of deprecated run_in_vm(vm, ...) (#421) --- qubesmanager/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 4560b5e..c97f7c3 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -932,7 +932,7 @@ class VmManagerWindow(QMainWindow): if vm.qid == 0: subprocess.check_call (["/usr/bin/qvm-dom0-update", "--gui"]) else: - qubesutils.run_in_vm(vm, "user:gpk-update-viewer", verbose=False, autostart=True) + vm.run("user:gpk-update-viewer", verbose=False, autostart=True) except Exception as ex: thread_monitor.set_error_msg(str(ex)) thread_monitor.set_finished() From 7f7e648fae9a8d0575bf3b8a2719ad87a513094a Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 23 Feb 2012 00:17:15 +0100 Subject: [PATCH 2/7] version 1.2.1 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 26aaba0..6085e94 100644 --- a/version +++ b/version @@ -1 +1 @@ -1.2.0 +1.2.1 From 7860a16c3f61f1b846a8f6742679fd0b7ef70188 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 23 Feb 2012 09:44:50 +0100 Subject: [PATCH 3/7] spec: update Requires --- rpm_spec/qmgr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec index e45f853..3fcc12d 100644 --- a/rpm_spec/qmgr.spec +++ b/rpm_spec/qmgr.spec @@ -11,7 +11,7 @@ Group: Qubes Vendor: Invisible Things Lab License: GPL URL: http://fixme -Requires: python, PyQt4, qubes-core-dom0 >= 1.3.1, kdebase +Requires: python, PyQt4, qubes-core-dom0 >= 1.7.12, kdebase BuildRequires: PyQt4-devel AutoReq: 0 From aa405028ed2d348b4507a76019db9106c44657fe Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Thu, 23 Feb 2012 09:45:02 +0100 Subject: [PATCH 4/7] version 1.2.1-2 --- rpm_spec/qmgr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec index 3fcc12d..92b63d8 100644 --- a/rpm_spec/qmgr.spec +++ b/rpm_spec/qmgr.spec @@ -4,7 +4,7 @@ Name: qubes-manager Version: %{version} -Release: 1 +Release: 2 Summary: The Graphical Qubes VM Manager. Group: Qubes From 1b8e63728a751e413c96484377f71cd057c6b499 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 24 Feb 2012 16:33:09 +0100 Subject: [PATCH 5/7] spec: require pmount --- rpm_spec/qmgr.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec index 92b63d8..58a0a77 100644 --- a/rpm_spec/qmgr.spec +++ b/rpm_spec/qmgr.spec @@ -12,6 +12,7 @@ Vendor: Invisible Things Lab License: GPL URL: http://fixme Requires: python, PyQt4, qubes-core-dom0 >= 1.7.12, kdebase +Requires: pmount BuildRequires: PyQt4-devel AutoReq: 0 From 3ff0cd0b9f51de122491d7f82e6b5a35d04a9fb9 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 24 Feb 2012 16:33:26 +0100 Subject: [PATCH 6/7] version 1.2.1-3 --- rpm_spec/qmgr.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm_spec/qmgr.spec b/rpm_spec/qmgr.spec index 58a0a77..e3bf07d 100644 --- a/rpm_spec/qmgr.spec +++ b/rpm_spec/qmgr.spec @@ -4,7 +4,7 @@ Name: qubes-manager Version: %{version} -Release: 2 +Release: 3 Summary: The Graphical Qubes VM Manager. Group: Qubes From 72fea97066fd8b87c3048d6f1778c43dd17745ef Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Sun, 4 Mar 2012 22:02:27 +0100 Subject: [PATCH 7/7] follow API change: netvm_vm -> netvm --- qubesmanager/main.py | 4 ++-- qubesmanager/settings.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qubesmanager/main.py b/qubesmanager/main.py index 1ed9384..9627b79 100755 --- a/qubesmanager/main.py +++ b/qubesmanager/main.py @@ -191,8 +191,8 @@ class VmNetvmItem (QTableWidgetItem): if vm.is_netvm() and not vm.is_proxyvm(): self.setText("n/a") - elif vm.netvm_vm is not None: - self.setText(vm.netvm_vm.name) + elif vm.netvm is not None: + self.setText(vm.netvm.name) else: self.setText("---") diff --git a/qubesmanager/settings.py b/qubesmanager/settings.py index 9ca2475..9a4aa22 100644 --- a/qubesmanager/settings.py +++ b/qubesmanager/settings.py @@ -150,7 +150,7 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): def current_tab_changed(self, idx): if idx == self.tabs_indices["firewall"]: - if self.vm.netvm_vm is not None and not self.vm.netvm_vm.is_proxyvm(): + if self.vm.netvm is not None and not self.vm.netvm.is_proxyvm(): QMessageBox.warning (None, "VM configuration problem!", "The '{0}' AppVM is not network connected to a FirewallVM!

".format(self.vm.name) +\ "You may edit the '{0}' VM firewall rules, but these will not take any effect until you connect it to a working Firewall VM.".format(self.vm.name)) @@ -195,9 +195,9 @@ class VMSettingsWindow(Ui_SettingsDialog, QDialog): self.netvm_idx = 0 for (i, vm) in enumerate(netvm_list): text = vm.name - if vm is self.qvm_collection.get_default_netvm_vm(): + if vm is self.qvm_collection.get_default_netvm(): text += " (default)" - if vm.qid == self.vm.netvm_vm.qid: + if vm.qid == self.vm.netvm.qid: self.netvm_idx = i text += " (current)" self.netVM.insertItem(i, text)