Fix 2 typos in the web code

svn path=/trunk/packages/invirt-web/; revision=1618

diff --git a/code/controls.py b/code/controls.py
index 5512f66..5c856e3 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -24,9 +24,9 @@ def uuidToString(u):
 # end stolen code
 
 def remctl(*args, **kwargs):
 # end stolen code
 
 def remctl(*args, **kwargs):

-    return gen_remctl(config.remote.hostname, *args,
+    return gen_remctl(config.remote.hostname,

                       principal='daemon/'+config.web.hostname,
                       principal='daemon/'+config.web.hostname,

-                      **kwargs)
+                      *args, **kwargs)

 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""

diff --git a/code/main.py b/code/main.py
index 5037a09..70e8912 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -246,7 +246,7 @@ def vnc(username, state, path, fields):
     """
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 
     """
     machine = validation.Validate(username, state, machine_id=fields.getfirst('machine_id')).machine
 

-    token = control.vnctoken(machine)
+    token = controls.vnctoken(machine)

     host = controls.listHost(machine)
     if host:
         port = 10003 + [h.hostname for h in config.hosts].index(host)
     host = controls.listHost(machine)
     if host:
         port = 10003 + [h.hostname for h in config.hosts].index(host)