← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/filesystem/serve/__init__.py

  • Committer: Matt Giuca
  • Date: 2009-05-19 02:54:08 UTC
  • mfrom: (1258 trunk)
  • mto: This revision was merged to the branch mainline in revision 1322.
  • Revision ID: matt.giuca@gmail.com-20090519025408-19c7cjl7w6ot6frm
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/filesystem/serve/__init__.py
29
29
import cjson
30
30
 
31
31
from ivle import (studpath, interpret)
32
 
import ivle.conf
33
32
from ivle.database import User
34
33
from ivle.webapp.base.views import BaseView
35
34
from ivle.webapp.base.xhtml import XHTMLErrorView
100
99
        else:
101
100
            args.append(path)
102
101
 
103
 
        (out, err) = ivle.interpret.execute_raw(owner, jail, '/home',
104
 
                    os.path.join(ivle.conf.share_path, 'services/serveservice'),
 
102
        (out, err) = interpret.execute_raw(owner, jail, '/home',
 
103
                    os.path.join(req.config['paths']['share'],
 
104
                                 'services/serveservice'),
105
105
                    args)
106
106
        assert not err
107
107