← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-buildjail

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ivle-buildjail
43
43
    help='''Apply any package updates in the jail.''')
44
44
parser.add_option("-m", "--mirror",
45
45
    action="store", dest="apt_mirror",
46
 
    help="Sets the apt mirror used when recreating the jail.")
 
46
    help="Sets the apt mirror.", default="http://archive.ubuntu.com/ubuntu")
47
47
(options, args) = parser.parse_args(sys.argv)
48
48
 
49
49
if os.geteuid() != 0:
55
55
    sys.exit(1)
56
56
 
57
57
if options.recreate:
 
58
    options.upgrade = True
 
59
 
58
60
    # Create the jail and its subdirectories
59
61
    # Note: Other subdirs will be made by copying files
60
62
    if options.apt_mirror is not None:
64
66
    ivle.jailbuilder.debian.debootstrap_create_jail(conf['jail']['suite'],
65
67
              build_path, mirror=options.apt_mirror)
66
68
 
 
69
    ivle.jailbuilder.debian.apt_update_cache(build_path)
 
70
    ivle.jailbuilder.debian.apt_install(build_path,
 
71
                        ['python2.5', 'python-cjson', 'python-svn'])
 
72
 
 
73
    ivle.jailbuilder.debian.apt_clean(build_path)
 
74
 
 
75
if options.upgrade:
 
76
    # Run apt-get update, apt-get upgrade and apt-get clean.
 
77
    ivle.jailbuilder.debian.mangle_sources_list(build_path, clobber=True)
 
78
    ivle.jailbuilder.debian.mangle_sources_list(build_path, lines=[
 
79
            'deb %s %s%s %s' % (options.apt_mirror, conf['jail']['suite'],
 
80
                                pocket, ' '.join(['main', 'universe']))
 
81
            for pocket in ('', '-updates', '-security')])
 
82
 
67
83
    # Add any extra site apt sources.
68
84
    if conf['jail']['extra_sources']:
69
85
        ivle.jailbuilder.debian.mangle_sources_list(build_path,
75
91
                                            conf['jail']['extra_keys'])
76
92
 
77
93
    ivle.jailbuilder.debian.apt_update_cache(build_path)
78
 
    ivle.jailbuilder.debian.apt_install(build_path,
79
 
                        ['python2.5', 'python-cjson', 'python-svn'])
 
94
    ivle.jailbuilder.debian.apt_upgrade(build_path)
80
95
 
81
96
    # Install any extra site packages.
82
97
    if conf['jail']['extra_packages']:
85
100
 
86
101
    ivle.jailbuilder.debian.apt_clean(build_path)
87
102
 
88
 
if options.upgrade:
89
 
    # Run apt-get update, apt-get upgrade and apt-get clean.
90
 
    ivle.jailbuilder.debian.apt_update_cache(build_path)
91
 
    ivle.jailbuilder.debian.apt_upgrade(build_path)
92
 
    ivle.jailbuilder.debian.apt_clean(build_path)
93
 
 
94
103
if conf['jail']['devmode']:
95
104
    # Copy all console and operating system files into the jail
96
105
    services_path = os.path.join(ivle.conf.share_path, 'services')