← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-buildjail

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ivle-buildjail
79
79
    if options.apt_mirror is not None:
80
80
        os.environ['MIRROR'] = options.apt_mirror
81
81
 
 
82
    # Print a final warning to the user that this is a potentially-expensive
 
83
    # operation
 
84
    recreating = "Re-creating" if os.path.exists(build_path) else "Creating"
 
85
    print_mirror = options.apt_mirror or 'http://archive.ubuntu.com/ubuntu'
 
86
    print """%s jail from %s
 
87
Be warned, this may download hundreds of megabytes!
 
88
If this is the wrong source, please cancel now (note that it is too late to
 
89
save the existing jail; you will have to rebuild the jail from scratch now).\
 
90
""" % (recreating, print_mirror)
 
91
 
82
92
    os.system('rm -rf --one-file-system ' + build_path)
83
93
    ivle.jailbuilder.debian.debootstrap_create_jail(conf['jail']['suite'],
84
94
              build_path, mirror=options.apt_mirror)
86
96
    ivle.jailbuilder.debian.apt_update_cache(build_path)
87
97
    # Minimal required packages
88
98
    ivle.jailbuilder.debian.apt_install(build_path,
89
 
            ['python2.5', 'python-cjson', 'python-svn', 'python-configobj'])
 
99
            ['python', 'python-simplejson', 'python-svn', 'python-configobj'])
90
100
 
91
101
    ivle.jailbuilder.debian.apt_clean(build_path)
92
102