[buildd-tools-devel] Bug#811202: sbuild: order some code differently

[Johannes Schauer]

Source: sbuild
Version: 0.68.0-1
Severity: minor

Hi,

two things sbuild does should be done in different order:

 1. The EXTRA_REPOSITORIES are added to $dummy_archive_list_file in
    setup_apt_archive() in lib/Sbuild/ResolverBase.pm. But
    setup_apt_archive() is only called from install_deps() in the
    lib/Sbuild/*Resolver.pm files. This is too late because this means
    that the initial update/upgrade step from run_chroot_update() in
    lib/Sbuild/Build.pm will ignore any extra repositories passed on the
    command line. This is no problem if the extra repository is only
    used to install additional packages but it is a problem if the extra
    repository contains packages with higher versions than the installed
    essential or build-essential packages. Also see bug #792037

 2. The function run_chroot_update() in lib/Sbuild/Build.pm should not
    be run multiple times. Especially not now that there is an external
    command hook for this step. Running update and upgrade once should
    be sufficient. Instead though, run_chroot_update() is called again
    if a new architecture was added in check_architectures(). Thus, the
    check whether foreign architectures have to be added should be moved
    to before the original call to run_chroot_update() in
    run_chroot_session_locked().

I'm filing these two code shuffling issues here together as a reminder
for later because before I implement them I want to push the decoupling
of the chroot from the host and doing the code shuffling before that
would mean another round of needless rebasing which I want to avoid.

Since neither issues seem to be critical, they'll be fixed at a later
point.

cheers, josch