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

update qubesmanager to compile under python3.

Browse Source 
note: qvm-net.py has changed location to a weird one.
This commit is contained in:
Marta Marczykowska-Górecka 2017-06-25 17:32:46 +02:00
parent 5daa35a301
commit fb3dc6ecf7
No known key found for this signature in database
GPG Key ID: 9A752C30B26FD04B
6 changed files with 59 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qubesmanager/backup.py
View File

@ -327,7 +327,7 @@ class BackupVMsWindow(Ui_Backup, QWizard):
if ex.tmpdir: if ex.tmpdir:
self.tmpdir_to_remove = ex.tmpdir self.tmpdir_to_remove = ex.tmpdir
except Exception as ex: except Exception as ex:
print "Exception:", ex print("Exception:", ex)
msg.append(str(ex)) msg.append(str(ex))
if len(msg) > 0 : if len(msg) > 0 :
@ -352,7 +352,7 @@ class BackupVMsWindow(Ui_Backup, QWizard):
print_callback = self.gather_output, print_callback = self.gather_output,
hide_vm_names=self.encryption_checkbox.isChecked()) hide_vm_names=self.encryption_checkbox.isChecked())
except Exception as ex: except Exception as ex:
print "Exception:", ex print("Exception:", ex)
QMessageBox.critical(None, QMessageBox.critical(None,
self.tr("Error while preparing backup."), self.tr("Error while preparing backup."),
unicode(self.tr("ERROR: {0}")).format(ex)) unicode(self.tr("ERROR: {0}")).format(ex))

2
qubesmanager/clipboard.py
View File

@ -40,7 +40,7 @@ def copy_text_to_qubes_clipboard(text):
#inter-appviewer lock #inter-appviewer lock
try: try:
fd = os.open(APPVIEWER_LOCK, os.O_RDWR|os.O_CREAT, 0666) fd = os.open(APPVIEWER_LOCK, os.O_RDWR|os.O_CREAT, 0o0666)
except: except:
QMessageBox.warning(None, "Warning!", "Error while accessing Qubes clipboard!") QMessageBox.warning(None, "Warning!", "Error while accessing Qubes clipboard!")
else: else:

6
qubesmanager/main.py
View File

@ -899,7 +899,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
QString("org.QubesOS.Audio"), # interface QString("org.QubesOS.Audio"), # interface
QString("RecAllowedChanged"), # name QString("RecAllowedChanged"), # name
self.recAllowedChanged): # slot self.recAllowedChanged): # slot
print session_bus.lastError().message() print(session_bus.lastError().message())
# noinspection PyPep8Naming # noinspection PyPep8Naming
def sortIndicatorChanged(self, column, order): def sortIndicatorChanged(self, column, order):
@ -1207,7 +1207,7 @@ class VmManagerWindow(Ui_VmManagerWindow, QMainWindow):
return return
self.start_vm(vm) self.start_vm(vm)
def start_vm(self, vm): def start_vm(self, vm):
assert not vm.is_running() assert not vm.is_running()
@ -2121,7 +2121,7 @@ def handle_exception(exc_type, exc_value, exc_traceback):
msg_box.exec_() msg_box.exec_()
else: else:
print >>sys.stderr, message print(message, file=sys.stderr)
def sighup_handler(signum, frame): def sighup_handler(signum, frame):
os.execl("/usr/bin/qubes-manager", "qubes-manager") os.execl("/usr/bin/qubes-manager", "qubes-manager")

6
qubesmanager/qvm_net.py
View File

@ -26,14 +26,14 @@ def tree(netvm, padding):
else: else:
vm_name = qvm_collection[vm].name vm_name = qvm_collection[vm].name
if qvm_collection[vm].is_template(): if qvm_collection[vm].is_template():
print padding,'|->',vm_name,'(Tpl)' print(padding,'|->',vm_name,'(Tpl)')
else: else:
print padding,'|->',vm_name print(padding,'|->',vm_name)
if qvm_collection[vm].is_netvm() : if qvm_collection[vm].is_netvm() :
tree(qvm_collection[vm], padding) tree(qvm_collection[vm], padding)
padding='' padding=''
for vm in qvm_collection: for vm in qvm_collection:
if qvm_collection[vm].is_netvm() and not qvm_collection[vm].netvm : if qvm_collection[vm].is_netvm() and not qvm_collection[vm].netvm :
print qvm_collection[vm].name print(qvm_collection[vm].name)
tree(qvm_collection[vm], padding) tree(qvm_collection[vm], padding)

2
qubesmanager/restore.py
View File

@ -190,7 +190,7 @@ class RestoreVMsWindow(Ui_Restore, QWizard):
self.tmpdir_to_remove = ex.tmpdir self.tmpdir_to_remove = ex.tmpdir
err_msg.append(unicode(ex)) err_msg.append(unicode(ex))
except Exception as ex: except Exception as ex:
print "Exception:", ex print ("Exception:", ex)
err_msg.append(unicode(ex)) err_msg.append(unicode(ex))
err_msg.append( err_msg.append(
self.tr("Partially restored files left in " self.tr("Partially restored files left in "

198
rpm_spec/qmgr.spec
View File

@ -1,5 +1,3 @@
%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
%{!?version: %define version %(cat version)} %{!?version: %define version %(cat version)}
Name: qubes-manager Name: qubes-manager
@ -11,11 +9,13 @@ Group: Qubes
Vendor: Invisible Things Lab Vendor: Invisible Things Lab
License: GPL License: GPL
URL: http://fixme URL: http://fixme
Requires: python, PyQt4, qubes-core-dom0-linux >= 2.0.22, qubes-core-dom0 >= 3.0.18 Requires: python3, PyQt4, qubes-core-dom0-linux >= 2.0.22, qubes-core-dom0 >= 3.0.18
Requires: pmount, cryptsetup, wmctrl Requires: pmount, cryptsetup, wmctrl
Requires: dbus Requires: dbus
Requires: qubes-artwork Requires: qubes-artwork
BuildRequires: PyQt4-devel BuildRequires: python3-PyQt4-devel
BuildRequires: python3-devel
BuildRequires: qt-devel
AutoReq: 0 AutoReq: 0
%define _builddir %(pwd) %define _builddir %(pwd)
@ -25,8 +25,8 @@ The Graphical Qubes VM Manager.
%build %build
make res translations make res translations
python -m compileall qubesmanager python3 -m compileall qubesmanager
python -O -m compileall qubesmanager python3 -O -m compileall qubesmanager
%install %install
mkdir -p $RPM_BUILD_ROOT/usr/bin/ mkdir -p $RPM_BUILD_ROOT/usr/bin/
@ -37,47 +37,13 @@ mkdir -p $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ cp qubesmanager/mount_for_backup.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/qvm_about.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ cp qubesmanager/qvm_about.sh $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/qvm_net.py $RPM_BUILD_ROOT/usr/libexec/qubes-manager/ cp qubesmanager/qvm_net.py $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/qvm_net.pyo $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
cp qubesmanager/qvm_net.pyc $RPM_BUILD_ROOT/usr/libexec/qubes-manager/
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager/ mkdir -p $RPM_BUILD_ROOT%{python3_sitelib}/qubesmanager/
cp qubesmanager/main.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager cp -r qubesmanager/__pycache__ $RPM_BUILD_ROOT%{python3_sitelib}/qubesmanager/
cp qubesmanager/clipboard.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager cp qubesmanager/*.py $RPM_BUILD_ROOT%{python3_sitelib}/qubesmanager/
cp qubesmanager/block.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/table_widgets.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/appmenu_select.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/backup.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/backup_utils.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/firewall.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/global_settings.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/multiselectwidget.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/restore.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/settings.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/log_dialog.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/about.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/releasenotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/informationnotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/networknotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/create_new_vm.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/thread_monitor.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/resources_rc.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/__init__.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_backupdlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_globalsettingsdlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_mainwindow.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_multiselectwidget.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_newappvmdlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_newfwruledlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_restoredlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_settingsdlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_logdlg.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_about.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_releasenotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_informationnotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
cp qubesmanager/ui_networknotes.py{,c,o} $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager
mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager/i18n mkdir -p $RPM_BUILD_ROOT%{python3_sitelib}/qubesmanager/i18n
cp i18n/qubesmanager_*.qm $RPM_BUILD_ROOT%{python_sitearch}/qubesmanager/i18n/ cp i18n/qubesmanager_*.qm $RPM_BUILD_ROOT%{python3_sitelib}/qubesmanager/i18n/
mkdir -p $RPM_BUILD_ROOT/usr/share/applications mkdir -p $RPM_BUILD_ROOT/usr/share/applications
cp qubes-manager.desktop $RPM_BUILD_ROOT/usr/share/applications cp qubes-manager.desktop $RPM_BUILD_ROOT/usr/share/applications
@ -106,110 +72,44 @@ rm -rf $RPM_BUILD_ROOT
/usr/libexec/qubes-manager/qvm_net.py /usr/libexec/qubes-manager/qvm_net.py
/usr/libexec/qubes-manager/qvm_net.pyo /usr/libexec/qubes-manager/qvm_net.pyo
/usr/libexec/qubes-manager/qvm_net.pyc /usr/libexec/qubes-manager/qvm_net.pyc
%dir %{python_sitearch}/qubesmanager %dir %{python3_sitelib}/qubesmanager
%{python_sitearch}/qubesmanager/__init__.py %{python3_sitelib}/qubesmanager/__pycache__
%{python_sitearch}/qubesmanager/__init__.pyo %{python3_sitelib}/qubesmanager/__init__.py
%{python_sitearch}/qubesmanager/__init__.pyc %{python3_sitelib}/qubesmanager/main.py
%{python_sitearch}/qubesmanager/main.py %{python3_sitelib}/qubesmanager/clipboard.py
%{python_sitearch}/qubesmanager/main.pyc %{python3_sitelib}/qubesmanager/block.py
%{python_sitearch}/qubesmanager/main.pyo %{python3_sitelib}/qubesmanager/table_widgets.py
%{python_sitearch}/qubesmanager/clipboard.py %{python3_sitelib}/qubesmanager/appmenu_select.py
%{python_sitearch}/qubesmanager/clipboard.pyc %{python3_sitelib}/qubesmanager/backup.py
%{python_sitearch}/qubesmanager/clipboard.pyo %{python3_sitelib}/qubesmanager/backup_utils.py
%{python_sitearch}/qubesmanager/block.py %{python3_sitelib}/qubesmanager/firewall.py
%{python_sitearch}/qubesmanager/block.pyc %{python3_sitelib}/qubesmanager/global_settings.py
%{python_sitearch}/qubesmanager/block.pyo %{python3_sitelib}/qubesmanager/multiselectwidget.py
%{python_sitearch}/qubesmanager/table_widgets.py %{python3_sitelib}/qubesmanager/restore.py
%{python_sitearch}/qubesmanager/table_widgets.pyc %{python3_sitelib}/qubesmanager/settings.py
%{python_sitearch}/qubesmanager/table_widgets.pyo %{python3_sitelib}/qubesmanager/log_dialog.py
%{python_sitearch}/qubesmanager/appmenu_select.py %{python3_sitelib}/qubesmanager/about.py
%{python_sitearch}/qubesmanager/appmenu_select.pyc %{python3_sitelib}/qubesmanager/releasenotes.py
%{python_sitearch}/qubesmanager/appmenu_select.pyo %{python3_sitelib}/qubesmanager/informationnotes.py
%{python_sitearch}/qubesmanager/backup.py %{python3_sitelib}/qubesmanager/networknotes.py
%{python_sitearch}/qubesmanager/backup.pyc %{python3_sitelib}/qubesmanager/create_new_vm.py
%{python_sitearch}/qubesmanager/backup.pyo %{python3_sitelib}/qubesmanager/thread_monitor.py
%{python_sitearch}/qubesmanager/backup_utils.py %{python3_sitelib}/qubesmanager/resources_rc.py
%{python_sitearch}/qubesmanager/backup_utils.pyc %{python3_sitelib}/qubesmanager/qvm_net.py
%{python_sitearch}/qubesmanager/backup_utils.pyo %{python3_sitelib}/qubesmanager/ui_backupdlg.py
%{python_sitearch}/qubesmanager/firewall.py %{python3_sitelib}/qubesmanager/ui_globalsettingsdlg.py
%{python_sitearch}/qubesmanager/firewall.pyc %{python3_sitelib}/qubesmanager/ui_mainwindow.py
%{python_sitearch}/qubesmanager/firewall.pyo %{python3_sitelib}/qubesmanager/ui_multiselectwidget.py
%{python_sitearch}/qubesmanager/global_settings.py %{python3_sitelib}/qubesmanager/ui_newappvmdlg.py
%{python_sitearch}/qubesmanager/global_settings.pyc %{python3_sitelib}/qubesmanager/ui_newfwruledlg.py
%{python_sitearch}/qubesmanager/global_settings.pyo %{python3_sitelib}/qubesmanager/ui_restoredlg.py
%{python_sitearch}/qubesmanager/multiselectwidget.py %{python3_sitelib}/qubesmanager/ui_settingsdlg.py
%{python_sitearch}/qubesmanager/multiselectwidget.pyc %{python3_sitelib}/qubesmanager/ui_logdlg.py
%{python_sitearch}/qubesmanager/multiselectwidget.pyo %{python3_sitelib}/qubesmanager/ui_about.py
%{python_sitearch}/qubesmanager/restore.py %{python3_sitelib}/qubesmanager/ui_releasenotes.py
%{python_sitearch}/qubesmanager/restore.pyc %{python3_sitelib}/qubesmanager/ui_informationnotes.py
%{python_sitearch}/qubesmanager/restore.pyo %{python3_sitelib}/qubesmanager/ui_networknotes.py
%{python_sitearch}/qubesmanager/settings.py %{python3_sitelib}/qubesmanager/i18n/qubesmanager_*.qm
%{python_sitearch}/qubesmanager/settings.pyc
%{python_sitearch}/qubesmanager/settings.pyo
%{python_sitearch}/qubesmanager/log_dialog.py
%{python_sitearch}/qubesmanager/log_dialog.pyc
%{python_sitearch}/qubesmanager/log_dialog.pyo
%{python_sitearch}/qubesmanager/about.py
%{python_sitearch}/qubesmanager/about.pyc
%{python_sitearch}/qubesmanager/about.pyo
%{python_sitearch}/qubesmanager/releasenotes.py
%{python_sitearch}/qubesmanager/releasenotes.pyc
%{python_sitearch}/qubesmanager/releasenotes.pyo
%{python_sitearch}/qubesmanager/informationnotes.py
%{python_sitearch}/qubesmanager/informationnotes.pyc
%{python_sitearch}/qubesmanager/informationnotes.pyo
%{python_sitearch}/qubesmanager/networknotes.py
%{python_sitearch}/qubesmanager/networknotes.pyc
%{python_sitearch}/qubesmanager/networknotes.pyo
%{python_sitearch}/qubesmanager/create_new_vm.py
%{python_sitearch}/qubesmanager/create_new_vm.pyc
%{python_sitearch}/qubesmanager/create_new_vm.pyo
%{python_sitearch}/qubesmanager/thread_monitor.py
%{python_sitearch}/qubesmanager/thread_monitor.pyc
%{python_sitearch}/qubesmanager/thread_monitor.pyo
%{python_sitearch}/qubesmanager/resources_rc.py
%{python_sitearch}/qubesmanager/resources_rc.pyc
%{python_sitearch}/qubesmanager/resources_rc.pyo
%{python_sitearch}/qubesmanager/ui_backupdlg.py
%{python_sitearch}/qubesmanager/ui_backupdlg.pyc
%{python_sitearch}/qubesmanager/ui_backupdlg.pyo
%{python_sitearch}/qubesmanager/ui_globalsettingsdlg.py
%{python_sitearch}/qubesmanager/ui_globalsettingsdlg.pyc
%{python_sitearch}/qubesmanager/ui_globalsettingsdlg.pyo
%{python_sitearch}/qubesmanager/ui_mainwindow.py
%{python_sitearch}/qubesmanager/ui_mainwindow.pyc
%{python_sitearch}/qubesmanager/ui_mainwindow.pyo
%{python_sitearch}/qubesmanager/ui_multiselectwidget.py
%{python_sitearch}/qubesmanager/ui_multiselectwidget.pyc
%{python_sitearch}/qubesmanager/ui_multiselectwidget.pyo
%{python_sitearch}/qubesmanager/ui_newappvmdlg.py
%{python_sitearch}/qubesmanager/ui_newappvmdlg.pyc
%{python_sitearch}/qubesmanager/ui_newappvmdlg.pyo
%{python_sitearch}/qubesmanager/ui_newfwruledlg.py
%{python_sitearch}/qubesmanager/ui_newfwruledlg.pyc
%{python_sitearch}/qubesmanager/ui_newfwruledlg.pyo
%{python_sitearch}/qubesmanager/ui_restoredlg.py
%{python_sitearch}/qubesmanager/ui_restoredlg.pyc
%{python_sitearch}/qubesmanager/ui_restoredlg.pyo
%{python_sitearch}/qubesmanager/ui_settingsdlg.py
%{python_sitearch}/qubesmanager/ui_settingsdlg.pyc
%{python_sitearch}/qubesmanager/ui_settingsdlg.pyo
%{python_sitearch}/qubesmanager/ui_logdlg.py
%{python_sitearch}/qubesmanager/ui_logdlg.pyc
%{python_sitearch}/qubesmanager/ui_logdlg.pyo
%{python_sitearch}/qubesmanager/ui_about.py
%{python_sitearch}/qubesmanager/ui_about.pyc
%{python_sitearch}/qubesmanager/ui_about.pyo
%{python_sitearch}/qubesmanager/ui_releasenotes.py
%{python_sitearch}/qubesmanager/ui_releasenotes.pyc
%{python_sitearch}/qubesmanager/ui_releasenotes.pyo
%{python_sitearch}/qubesmanager/ui_informationnotes.py
%{python_sitearch}/qubesmanager/ui_informationnotes.pyc
%{python_sitearch}/qubesmanager/ui_informationnotes.pyo
%{python_sitearch}/qubesmanager/ui_networknotes.py
%{python_sitearch}/qubesmanager/ui_networknotes.pyc
%{python_sitearch}/qubesmanager/ui_networknotes.pyo
%{python_sitearch}/qubesmanager/i18n/qubesmanager_*.qm
/usr/share/applications/qubes-manager.desktop /usr/share/applications/qubes-manager.desktop
/etc/xdg/autostart/qubes-manager.desktop /etc/xdg/autostart/qubes-manager.desktop
/etc/dbus-1/system.d/org.qubesos.QubesManager.conf /etc/dbus-1/system.d/org.qubesos.QubesManager.conf