~ci-train-bot/libertine/libertine-ubuntu-zesty-2216

« back to all changes in this revision

Viewing changes to python/libertine/ChrootContainer.py

Support armhf based chroots and add stable overlay PPA for xenial based chroots. Fixes: https://bugs.launchpad.net/bugs/1642324.

Approved by Larry Price, Libertine CI Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
            os.fchmod(fd.fileno(), 0o755)
98
98
 
99
99
        # Add universe, multiverse, and -updates to the chroot's sources.list
100
 
        if (self.architecture == 'armhf'):
 
100
        if (self.architecture == 'armhf' or self.architecture == 'arm64'):
101
101
            archive = "deb http://ports.ubuntu.com/ubuntu-ports "
102
102
        else:
103
103
            archive = "deb http://archive.ubuntu.com/ubuntu "
128
128
                self.destroy_libertine_container()
129
129
                return False
130
130
 
131
 
        if self.installed_release == "vivid":
 
131
        if self.installed_release == "vivid" or self.installed_release == "xenial":
132
132
            if verbosity == 1:
133
 
                print("Installing the Vivid Stable Overlay PPA...")
 
133
                print("Installing the Stable Overlay PPA...")
134
134
            if not self.install_package("software-properties-common", verbosity, update_cache=False):
135
135
                print("Failure installing software-properties-common during container creation")
136
136
                self.destroy_libertine_container()