← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to services/usrmgt-server

  • Committer: Matt Giuca
  • Date: 2009-04-22 05:14:58 UTC
  • Revision ID: matt.giuca@gmail.com-20090422051458-vh65hoaa3a54knxq
Stopped clobbering conf.py within the jail, using a proper ivle.conf instead.
Now works with Python 2.6 (and can have another version, possible 2.6, inside
the jail).

ivle/config/ivle-spec.conf: Added user_info section with in-jail variables.
ivle/makeuser: Writes a conf file (ivle.conf) instead of conf.py.
ivle/conf/conf.py: Added emulation layer bindings for the in-jail variables.
ivle-buildjail: No longer REMOVES the conf.py file (since it's just a normal
    source file now).

(--author Will)

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/usrmgt-server
4
4
import sys
5
5
import logging
6
6
 
7
 
import ivle.config
8
7
import ivle.conf
9
8
import ivle.database
10
9
import ivle.chat
140
139
def dispatch(props):
141
140
    logging.debug(repr(props))
142
141
 
143
 
    store = ivle.database.get_store(ivle.config.Config())
 
142
    store = ivle.database.get_store()
144
143
    action = props.keys()[0]
145
144
    res = actions[action](store, props[action])
146
145