← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-buildjail

  • Committer: Matt Giuca
  • Date: 2010-02-23 05:27:07 UTC
  • Revision ID: matt.giuca@gmail.com-20100223052707-3a76wo23r2z503t8
https://launchpad.net/bugs/526161
browser.js: Adjusted condition for enabling "Commit" action; now allowed if
    no files are selected AND current directory is versioned (as well as if
    all selected files are versioned). Committing with 0 files selected will
    commit the current directory.
ivle.fileservice_lib.action: Fixed to allow commit to contain 0 paths. This
    will commit the current directory instead.
This fixes Launchpad bug #526161.

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
 
 
92
82
    os.system('rm -rf --one-file-system ' + build_path)
93
83
    ivle.jailbuilder.debian.debootstrap_create_jail(conf['jail']['suite'],
94
84
              build_path, mirror=options.apt_mirror)
96
86
    ivle.jailbuilder.debian.apt_update_cache(build_path)
97
87
    # Minimal required packages
98
88
    ivle.jailbuilder.debian.apt_install(build_path,
99
 
            ['python', 'python-simplejson', 'python-svn', 'python-configobj'])
 
89
            ['python2.5', 'python-cjson', 'python-svn', 'python-configobj'])
100
90
 
101
91
    ivle.jailbuilder.debian.apt_clean(build_path)
102
92