~ubuntu-branches/ubuntu/natty/sbuild/natty-updates

« back to all changes in this revision

Viewing changes to lib/Sbuild/AptitudeResolver.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
* 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:
86
86
        '--without-recommends',
87
87
        '-o', "Aptitude::CmdLine::Ignore-Trust-Violations=$ignore_trust_violations",
88
88
        '-o', 'Aptitude::ProblemResolver::StepScore=100',
 
89
        '-o', "Aptitude::ProblemResolver::SolutionCost=safety, priority, non-default-versions",
89
90
        '-o', "Aptitude::ProblemResolver::Hints::KeepDummy=reject $dummy_pkg_name :UNINST",
90
91
        '-o', 'Aptitude::ProblemResolver::Keep-All-Level=55000',
91
92
        '-o', 'Aptitude::ProblemResolver::Remove-Essential-Level=maximum',