← Back to branch summary

~ubuntu-branches/ubuntu/utopic/sbuild/utopic

« back to all changes in this revision

Viewing changes to lib/Sbuild/Resolver.pm

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-06-23 22:27:58 UTC
  • mfrom: (8.1.24) (3.3.23 sid)
  • Revision ID: package-import@ubuntu.com-20120623222758-48ljspppdh7xzu9i
Tags: 0.63.1-1ubuntu1
https://launchpad.net/bugs/940410
* Resynchronize with Debian testing. Remaining changes:
  - debian/patches/do-not-install-debfoster-into-chroots.patch:
    do not install debfoster into the chroots because it is in universe and
    not needed for package building itself.
  - debian/patches/run-pre-build-hooks-as-root.patch:
    run pre-build hooks as root
* Drop run-lintian-inside-chroot.patch: It hasn't been picked up
  by Debian and doesn't work quite right (LP: #940410)

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Sbuild/Resolver.pm
20
20
 
21
21
package Sbuild::Resolver;
22
22
 
23
 
use Sbuild::InternalResolver;
24
23
use Sbuild::AptResolver;
 
24
use Sbuild::XaptResolver;
25
25
use Sbuild::AptitudeResolver;
26
26
 
27
27
use strict;
46
46
    my $resolver;
47
47
    if ($conf->get('BUILD_DEP_RESOLVER') eq "apt") {
48
48
        $resolver = Sbuild::AptResolver->new($conf, $session, $host);
 
49
    } elsif ($conf->get('BUILD_DEP_RESOLVER') eq "xapt") {
 
50
        $resolver = Sbuild::XaptResolver->new($conf, $session, $host);
49
51
    } elsif ($conf->get('BUILD_DEP_RESOLVER') eq "aptitude") {
50
52
        $resolver = Sbuild::AptitudeResolver->new($conf, $session, $host);
51
53
    } else {
52
 
        $resolver = Sbuild::InternalResolver->new($conf, $session, $host);
 
54
        $resolver = Sbuild::AptResolver->new($conf, $session, $host);
53
55
    }
54
56
 
55
57
    return $resolver;