← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/config/ivle-spec.conf

  • Committer: William Grant
  • Date: 2010-07-27 12:09:13 UTC
  • mto: This revision was merged to the branch mainline in revision 1826.
  • Revision ID: grantw@unimelb.edu.au-20100727120913-v0kfnwxzbiwrjnue
(simple)json always returns a unicode when decoding, while cjson returned a str where possible. This makes cPickle unhappy, so convert back to a str.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/config/ivle-spec.conf
81
81
suite = string(default="hardy")
82
82
mirror = string(default="http://archive.ubuntu.com/ubuntu")
83
83
extra_sources = string_list(default=list())
84
 
extra_packages = string_list(default=list('python-configobj', 'python-cjson', 'python-svn'))
 
84
extra_packages = string_list(default=list('python-configobj', 'python-simplejson', 'python-svn'))
85
85
extra_keys = string(default=None) # Cannot have triple-quoted list members.
86
86
 
87
87
# user_info is for jail-specific settings for the user who owns the jail