Use a simpler query construct in ConsoleFS.

svn path=/trunk/packages/invirt-console/; revision=2157

diff --git a/debian/changelog b/debian/changelog
index 1260150..16b71fc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-console (0.2.7) unstable; urgency=low
+
+  * Use a simpler query construct in ConsoleFS.
+
+ -- Evan Broder <broder@mit.edu>  Tue, 17 Feb 2009 04:23:05 -0500
+

 invirt-console (0.2.6) unstable; urgency=high
 
   * Turn off autocompletion of console names.  (LP: #326075)
 invirt-console (0.2.6) unstable; urgency=high
 
   * Turn off autocompletion of console names.  (LP: #326075)

diff --git a/server/usr/bin/invirt-consolefs b/server/usr/bin/invirt-consolefs
index 4fdd9dd..359ad16 100755 (executable)
--- a/server/usr/bin/invirt-consolefs
+++ b/server/usr/bin/invirt-consolefs
@@ -46,7 +46,7 @@ class ConsoleFS(routefs.RouteFS):
         if time() - self.lasttime > 5:
             self.lasttime = time()
             database.clear_cache()
         if time() - self.lasttime > 5:
             self.lasttime = time()
             database.clear_cache()

-            self.machines = dict((machine.name, machine) for machine in database.session.query(database.Machine).all())
+            self.machines = dict((machine.name, machine) for machine in database.Machine.query.all())

 
     def getMachines(self, **kw):
         self.recache()
 
     def getMachines(self, **kw):
         self.recache()