← Back to branch summary

~ubuntu-branches/ubuntu/precise/sbuild/precise

« back to all changes in this revision

Viewing changes to lib/Sbuild/Build.pm

  • Committer: Bazaar Package Importer
  • Author(s): Tarun Kumar Mall
  • Date: 2011-02-20 14:13:52 UTC
  • mfrom: (8.1.18 upstream) (3.3.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110220141352-bldamxslkqmfar97
Tags: 0.60.9-1ubuntu1
https://launchpad.net/bugs/722159
* Merge from debian unstable (LP: #722159). Remaining change: 
  - bin/sbuild-createchroot: do not install debfoster into the chroots
    because it is in universe and not needed for package building itself.
* Dropped change: (included in debian)
  - lib/Sbuild/ResolverBase.pm: use -o APT::Install-Recommends=false
    instead of --no-install-recommends as it is not a valid option in
    Dapper schroots. This is Ubuntu-specific and can be removed once 
    Dapper goes EoL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/Build.pm
360
360
    }
361
361
 
362
362
    $self->set('Session', $session);
363
 
    $self->set('Arch', $self->chroot_arch());
 
363
 
 
364
    my $chroot_arch =  $self->chroot_arch();
 
365
    if ($self->get('Arch') ne $chroot_arch) {
 
366
        $self->log_error("Build architecture (" . $self->get('Arch') .
 
367
                         ") is not the same as the chroot architecture (" .
 
368
                         $chroot_arch . ")\n");
 
369
        $self->log_info("Please specify the correct architecture with --arch, or use a chroot of the correct architecture\n");
 
370
        $self->set_status('failed');
 
371
        goto cleanup_unlocked_session;
 
372
    }
364
373
 
365
374
    $self->set('Chroot Dir', $session->get('Location'));
366
375
    # TODO: Don't hack the build location in; add a means to customise
475
484
    $self->set('Install End Time', $self->get('Install Start Time'));
476
485
    $resolver->add_dependencies('CORE', join(", ", @{$self->get_conf('CORE_DEPENDS')}) , "", "", "");
477
486
    if (!$resolver->install_deps('core', 'CORE')) {
478
 
        $self->log("Core source dependencies not satisfied; skipping");
 
487
        $self->log("Core source dependencies not satisfied; skipping\n");
479
488
        goto cleanup_packages;
480
489
    }
481
490
 
842
851
            $err = $defaults->{'STREAMERR'} if ($log_error);
843
852
            $self->get('Session')->run_command(
844
853
                { COMMAND => \@{$command},
845
 
                    USER => 'root',
 
854
                    USER => $self->get_conf('USERNAME'),
846
855
                    PRIORITY => 0,
847
856
                    STREAMOUT => $out,
848
857
                    STREAMERR => $err,