From 7a893acaab41404dd60009ca538d3bce95178be2 Mon Sep 17 00:00:00 2001 From: Yang Zhang Date: Sun, 3 Aug 2008 00:52:14 -0400 Subject: [PATCH 1/1] - sipb_xen_database -> invirt.database - removed redundant parameter to connect() svn path=/trunk/packages/sipb-xen-remote-server/; revision=835 --- files/usr/sbin/sipb-xen-remconffs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/files/usr/sbin/sipb-xen-remconffs b/files/usr/sbin/sipb-xen-remconffs index 7d49a95..0f94a94 100755 --- a/files/usr/sbin/sipb-xen-remconffs +++ b/files/usr/sbin/sipb-xen-remconffs @@ -12,7 +12,7 @@ import errno # for error number codes (ENOENT, etc) from syslog import * -import sipb_xen_database +from invirt import database from invirt.config import structs as config fuse.fuse_python_api = (0, 2) @@ -93,13 +93,13 @@ class RemConfFS(Fuse): older than 15 seconds""" if time() - self.lasttime > 15: self.lasttime = time() - sipb_xen_database.clear_cache() - return [machine.name for machine in sipb_xen_database.Machine.select()] + database.clear_cache() + return [machine.name for machine in database.Machine.select()] def getacl(self, machine_name): """Build the ACL file for a machine """ - machine = sipb_xen_database.Machine.get_by(name=machine_name) + machine = database.Machine.get_by(name=machine_name) users = [acl.user for acl in machine.acl] return "\n".join(map(self.userToPrinc, users) + ['include /etc/remctl/acl/web', @@ -228,7 +228,7 @@ class RemConfFS(Fuse): if __name__ == '__main__': - sipb_xen_database.connect(config.db.uri) + database.connect() usage=""" $0 [mount_path] """ -- 1.7.9.5