From 17a087ed4a64c92b03c47b413430fc78bd5d86df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adolfo=20G=C3=B3mez=20Garc=C3=ADa?= Date: Sun, 1 Feb 2015 05:53:54 +0100 Subject: [PATCH] * Removed binaries for NX from git (we have source code..) * Fixed downloadable list for administrators with actors --- .../uds/osmanagers/LinuxOsManager/__init__.py | 20 +++++++++++++----- .../osmanagers/WindowsOsManager/__init__.py | 2 +- server/src/uds/transports/NX/__init__.py | 8 +++---- .../NX/files/udsactor-nx_1.0_all.deb | Bin 2584 -> 0 bytes 4 files changed, 20 insertions(+), 10 deletions(-) delete mode 100644 server/src/uds/transports/NX/files/udsactor-nx_1.0_all.deb diff --git a/server/src/uds/osmanagers/LinuxOsManager/__init__.py b/server/src/uds/osmanagers/LinuxOsManager/__init__.py index 1080212a2..363299c19 100644 --- a/server/src/uds/osmanagers/LinuxOsManager/__init__.py +++ b/server/src/uds/osmanagers/LinuxOsManager/__init__.py @@ -35,15 +35,25 @@ from __future__ import unicode_literals from django.utils.translation import ugettext_noop as _ from uds.core.osmanagers.OSManagersFactory import OSManagersFactory from uds.core.managers.DownloadsManager import DownloadsManager -from LinuxOsManager import LinuxOsManager -from LinuxRandomPassOsManager import LinuxRandomPassManager +from .LinuxOsManager import LinuxOsManager +from .LinuxRandomPassOsManager import LinuxRandomPassManager import os.path import sys OSManagersFactory.factory().insert(LinuxOsManager) OSManagersFactory.factory().insert(LinuxRandomPassManager) -DownloadsManager.manager().registerDownloadable('udsactor_1.1_all.deb', - _('UDS Actor for linux machines (Requires python 2.6 or greater)'), - os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor_1.1_all.deb', +DownloadsManager.manager().registerDownloadable('udsactor_1.7.0_all.deb', + _('UDS Actor for Debian, Ubuntu, ... Linux machines (Requires python 2.7)'), + os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor_1.7.0_all.deb', + 'application/x-debian-package') + +DownloadsManager.manager().registerDownloadable('udsactor-1.7.0-1.noarch.rpm', + _('UDS Actor for Centos, Fedora, RH, ... Linux machines (Requires python 2.7)'), + os.path.dirname(sys.modules[__package__].__file__) + 'udsactor-1.7.0-1.noarch.rpm', + 'application/x-debian-package') + +DownloadsManager.manager().registerDownloadable('udsactor-opensuse-1.7.0-1.noarch.rpm', + _('UDS Actor for openSUSE, ... Linux machines (Requires python 2.7)'), + os.path.dirname(sys.modules[__package__].__file__) + 'udsactor-opensuse-1.7.0-1.noarch.rpm', 'application/x-debian-package') diff --git a/server/src/uds/osmanagers/WindowsOsManager/__init__.py b/server/src/uds/osmanagers/WindowsOsManager/__init__.py index 51a8cc2fd..bccb5714e 100644 --- a/server/src/uds/osmanagers/WindowsOsManager/__init__.py +++ b/server/src/uds/osmanagers/WindowsOsManager/__init__.py @@ -23,6 +23,6 @@ OSManagersFactory.factory().insert(WinDomainOsManager) OSManagersFactory.factory().insert(WinRandomPassManager) DownloadsManager.manager().registerDownloadable('UDSActorSetup.exe', - _('UDS Actor for windows machines (Important!! Requires .net framework 3.5 sp1)'), + _('UDS Actor for windows machines'), os.path.dirname(sys.modules[__package__].__file__) + '/files/UDSActorSetup.exe', 'application/x-msdos-program') diff --git a/server/src/uds/transports/NX/__init__.py b/server/src/uds/transports/NX/__init__.py index 014ec4583..1baf70187 100644 --- a/server/src/uds/transports/NX/__init__.py +++ b/server/src/uds/transports/NX/__init__.py @@ -47,7 +47,7 @@ UserPrefsManager.manager().registerPrefs('nx', _('NX Protocol'), CommonPrefs.screenSizePref ]) -DownloadsManager.manager().registerDownloadable('udsactor-nx_1.0_all.deb', - _('UDS Actor connector for NX (requires nomachine packages)'), - os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-nx_1.0_all.deb', - 'application/x-debian-package') +# DownloadsManager.manager().registerDownloadable('udsactor-nx_1.0_all.deb', +# _('UDS Actor connector for NX (requires nomachine packages)'), +# os.path.dirname(sys.modules[__package__].__file__) + '/files/udsactor-nx_1.0_all.deb', +# 'application/x-debian-package') diff --git a/server/src/uds/transports/NX/files/udsactor-nx_1.0_all.deb b/server/src/uds/transports/NX/files/udsactor-nx_1.0_all.deb deleted file mode 100644 index 96b3f9d6cef4d04c3b0cbcee73b7b03a6a265482..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2584 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