laborgui: Fixed rdesktop

miscellaneous/laborclient/cloudgui/gui.py

@@ -135,8 +135,7 @@ class Browser:
         try:
         try:
             scheme, rest = uri.split(":", 1)
             scheme, rest = uri.split(":", 1)
             if scheme == "nx" or scheme == "rdp" or scheme == "sshterm":
             if scheme == "nx" or scheme == "rdp" or scheme == "sshterm":
-                connection = rdp.RDP(uri)
-                Process(target=connection.connect).start()
+                subprocess.Popen(["/usr/local/bin/rdp",uri])
                 return True
                 return True
             elif scheme == "cloudfile":
             elif scheme == "cloudfile":
                 file_path = os.path.normpath(rest)
                 file_path = os.path.normpath(rest)
@@ -153,7 +152,7 @@ class Browser:
         try:
         try:
             os.makedirs(self.folder)
             os.makedirs(self.folder)
         except:
         except:
-            print "Error"
+            pass
         result = subprocess.call(['/usr/bin/sshfs', '-o', 'IdentityFile='+self.private_key_file+',StrictHostKeyChecking=no', neptun+"@"+host+":home", self.folder])
         result = subprocess.call(['/usr/bin/sshfs', '-o', 'IdentityFile='+self.private_key_file+',StrictHostKeyChecking=no', neptun+"@"+host+":home", self.folder])
         #print result
         #print result
     def umount_sshfs_folder(self):
     def umount_sshfs_folder(self):

miscellaneous/laborclient/cloudgui/rdp.py

@@ -53,8 +53,11 @@ class RDP:
         rdp_command = ["rdesktop", "-khu", "-E", "-P", "-0", "-f", "-u", self.username, "-p", self.password, self.host+":"+self.port]
         rdp_command = ["rdesktop", "-khu", "-E", "-P", "-0", "-f", "-u", self.username, "-p", self.password, self.host+":"+self.port]
         try:
         try:
             proc = subprocess.check_call(rdp_command, stdout = subprocess.PIPE)
             proc = subprocess.check_call(rdp_command, stdout = subprocess.PIPE)
-        except:
-            self.dialog_box("Unable to connect to host: "+self.host+" at port "+self.port)
+        except subprocess.CalledProcessError as e:
+            if e.returncode != 1:
+                print e
+                print e.returncode
+                self.dialog_box("Unable to connect to host: "+self.host+" at port "+self.port)
 
 
     def connect_nx(self):
     def connect_nx(self):
         #Generate temproary config
         #Generate temproary config