From 6e41e2bf8f0cadb4e8a717567a5c88dd63a4d091 Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Fri, 19 Apr 2013 18:17:30 -0400 Subject: [PATCH] sqlalchemy api fixups --- debian/changelog | 6 ++++++ server/usr/sbin/invirt-remote-create | 4 ++-- server/usr/sbin/invirt-remote-listuser | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ca018aa..191273d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,12 @@ invirt-remote (0.4.16) unstable; urgency=low -- Peter A. Iannucci Tue, 28 May 2013 20:19:00 -0400 +invirt-remote (0.4.15~glasgall1) precise; urgency=low + + * SQLAlchemy API fixups. + + -- Adam Glasgall Fri, 19 Apr 2013 18:17:44 -0400 + invirt-remote (0.4.14) unstable; urgency=low * Port packaging to dh_python2. diff --git a/server/usr/sbin/invirt-remote-create b/server/usr/sbin/invirt-remote-create index 9f5817a..25a1120 100755 --- a/server/usr/sbin/invirt-remote-create +++ b/server/usr/sbin/invirt-remote-create @@ -18,7 +18,7 @@ def maxMemory(owner, xmlist): """ Return the memory available for a new machine. """ - machines = invirt.database.Machine.query().filter_by(owner=owner) + machines = invirt.database.Machine.query.filter_by(owner=owner) (quota_total, quota_single) = invirt.database.Owner.getMemoryQuotas(owner) active_machines = [m for m in machines if m.name in xmlist] @@ -64,7 +64,7 @@ def main(argv): return 1 if operation == "create": - machine = invirt.database.Machine.query().filter_by(name=machine_name).first() + machine = invirt.database.Machine.query.filter_by(name=machine_name).first() owner = machine.owner vm_memory = machine.memory diff --git a/server/usr/sbin/invirt-remote-listuser b/server/usr/sbin/invirt-remote-listuser index 38bd744..edcfe23 100755 --- a/server/usr/sbin/invirt-remote-listuser +++ b/server/usr/sbin/invirt-remote-listuser @@ -17,7 +17,7 @@ def main(argv): database.connect() output = {} - for m in database.Machine.query().join('acl').filter_by(user=username): + for m in database.Machine.query.join('acl').filter_by(user=username): output[m.name] = dict(owner=m.owner, contact=m.contact) print yaml.dump(output, Dumper=yaml.CSafeDumper, default_flow_style=False) -- 1.7.9.5