From: Evan Broder <broder@mit.edu>
Date: Tue, 17 Feb 2009 09:29:46 +0000 (-0500)
Subject: Use a simpler query construct in ConsoleFS.
X-Git-Tag: 0.2.7^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-console.git/commitdiff_plain/a2cf90a67c235d1a1d5738d2141480faa09aa93c

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
--- 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)
diff --git a/server/usr/bin/invirt-consolefs b/server/usr/bin/invirt-consolefs
index 4fdd9dd..359ad16 100755
--- 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()
-            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()