Changeset 21727 in vbox for trunk

Timestamp:

Jul 20, 2009 2:56:41 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

50298

Message:

Python WS: few typos on authentication path

Location:

trunk/src/VBox

Files:

• Frontends/VBoxShell/vboxshell.py (modified) (2 diffs)
• Main/glue/vboxapi.py (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py ¶

@@ -129 +129 @@
 
     def onGuestPropertyChange(self, id, name, newValue, flags):
-        print "onGuestPropertyChange: %s: %s=%s" %(id, name, newValue)
+       print "onGuestPropertyChange: %s: %s=%s" %(id, name, newValue)
 
 g_hasreadline = 1
@@ -792 +792 @@
 
     if (len(args) > 2):
-        user = args[1]
+        user = args[2]
     else:
         user = ""
 
     if (len(args) > 3):
-        passwd = args[2]
+        passwd = args[3]
     else:
         passwd = ""

trunk/src/VBox/Main/glue/vboxapi.py ¶

@@ -397 +397 @@
 
     def getVirtualBox(self):
-        return connect(self.url, self.user, self.password)
+        return self.connect(self.url, self.user, self.password)
 
     def connect(self, url, user, passwd):
         if self.vbox is not None:
-             disconnect()
+             self.disconnect()
         from VirtualBox_wrappers import IWebsessionManager2
+        if url is None:
+            url = ""
         self.url = url
         if user is None:
@@ -412 +414 @@
         self.wsmgr = IWebsessionManager2(self.url)
         self.vbox = self.wsmgr.logon(self.user, self.password)
+        if not self.vbox.handle:
+            raise Exception("cannot connect to '"+self.url+"' as '"+self.user+"'")
         return self.vbox