← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-buildjail

  • Committer: William Grant
  • Date: 2010-07-28 05:06:15 UTC
  • Revision ID: grantw@unimelb.edu.au-20100728050615-uwbxn9frla3pdw8m
Encode content_type when downloading files. cjson made us write bad code.

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