From 2a75444031b19ba53822d5cac55ba6bd5694e6c1 Mon Sep 17 00:00:00 2001
From: Csók Tamás <godhak@gmail.com>
Date: Wed, 3 Sep 2014 15:26:41 +0200
Subject: [PATCH] client: corrected a typo
---
src/iss/installer/cloud.py | 2 +-
src/python/cloud.py | 2 +-
src/python/cloud2 | 10 ----------
src/python/cloud_connect_from_linux.py | 89 -----------------------------------------------------------------------------------------
4 files changed, 2 insertions(+), 101 deletions(-)
delete mode 100644 src/python/cloud2
delete mode 100644 src/python/cloud_connect_from_linux.py
diff --git a/src/iss/installer/cloud.py b/src/iss/installer/cloud.py
index 80889e8..1d9bac2 100644
--- a/src/iss/installer/cloud.py
+++ b/src/iss/installer/cloud.py
@@ -15,7 +15,7 @@ try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
-except ImporError:
+except ImportError:
pass
diff --git a/src/python/cloud.py b/src/python/cloud.py
index 80889e8..1d9bac2 100644
--- a/src/python/cloud.py
+++ b/src/python/cloud.py
@@ -15,7 +15,7 @@ try:
from selenium.webdriver.common.by import By
from selenium.webdriver.support.ui import WebDriverWait
from selenium.webdriver.support import expected_conditions as EC
-except ImporError:
+except ImportError:
pass
diff --git a/src/python/cloud2 b/src/python/cloud2
deleted file mode 100644
index 87df299..0000000
--- a/src/python/cloud2
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/python
-
-import cloud
-
-if __name__ == '__main__':
- try:
- cloud.main()
- finally:
- pass
-
diff --git a/src/python/cloud_connect_from_linux.py b/src/python/cloud_connect_from_linux.py
deleted file mode 100644
index 3b38bc8..0000000
--- a/src/python/cloud_connect_from_linux.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##
-# Távoli klienshez csatlakozás linux OS alól
-##
-
-import sys, os, time, subprocess, glob
-
-##
-# A távoli klienshez csatlakozás valósítja meg
-# NX és RDP esetén a remmina programot hívja meg. Ha a remmina-ban még nem szerepel
-# a kliens, a program elkészíti az indításhoz szükséges profilt.
-# @param vm Paraméterek a csatlakozáshoz
-# vm.protocol SSH, NX és RDP lehetséges
-# vm.host A virtuális gép címe
-# vm.port Ezen a porton csatlakozunk a virtuális géphez
-# vm.user Csatlakozáshoz használt név
-# vm.password Csatlakozáshoz használt jelszó
-#
-def connect(vm):
- if vm.protocol == "SSH":
- command = "sshpass -p %s ssh -p %s -o StrictHostKeyChecking=no %s@%s" % (vm.password, vm.port, vm.user, vm.host)
- subprocess.call(command, shell=True)
- elif vm.protocol in ("NX", "RDP"):
- server = "%s:%s" % (vm.host, vm.port)
- listdir = os.path.expanduser("~/.remmina/*.remmina")
- found = False
- for config_file in glob.glob(listdir):
- with open(config_file) as f:
- if server in f.read():
- found = True
- break
- if not found:
- config_file = "%s%s%s" % (os.path.expanduser("~/.remmina/"), str(int(time.time()*1000)), ".remmina")
- password = subprocess.check_output(["remminapasswd", vm.password])
- f = open(config_file, 'w')
- if vm.protocol == "NX":
- f.write(NX_template)
- else:
- f.write(RDP_template)
- f.write("name=%s:%s\nprotocol=%s\nserver=%s\nusername=%s\npassword=%s\n" % (vm.protocol, server, vm.protocol, server, vm.user, password))
- f.close()
- subprocess.call(["remmina", "-c", config_file])
-
-NX_template = """[remmina]
-ssh_auth=0
-quality=2
-disableencryption=0
-ssh_charset=
-ssh_privatekey=
-resolution=
-group=
-ssh_loopback=0
-exec=
-ssh_username=
-ssh_server=
-ssh_enabled=0
-nx_privatekey=
-showcursor=0
-disableclipboard=0
-window_maximize=1
-viewmode=4
-"""
-
-RDP_template = """[remmina]
-disableclipboard=0
-ssh_auth=0
-clientname=
-quality=2
-ssh_charset=
-ssh_privatekey=
-console=0
-resolution=
-group=
-ssh_loopback=0
-shareprinter=0
-ssh_username=
-ssh_server=
-security=
-execpath=
-sound=off
-exec=
-ssh_enabled=0
-sharefolder=
-domain=
-colordepth=24
-window_maximize=1
-viewmode=4
-"""
--
libgit2 0.26.0