← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apt/trusty

« back to all changes in this revision

Viewing changes to apt-private/private-upgrade.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2014-02-07 21:03:22 UTC
  • mfrom: (1.4.80 sid)
  • Revision ID: package-import@ubuntu.com-20140207210322-s7f833aga98ibdkm
Tags: 0.9.15.1ubuntu1
merged from debian/sid

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-private/private-upgrade.cc
 
1
 
1
2
// Includes                                                             /*{{{*/
2
3
#include <apt-pkg/algorithms.h>
3
4
#include <apt-pkg/upgrade.h>
39
40
   return UpgradeHelper(CmdL, 0);
40
41
}
41
42
                                                                        /*}}}*/
 
43
bool DoUpgrade(CommandLine &CmdL)                                       /*{{{*/
 
44
{
 
45
   if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true)
 
46
      return DoUpgradeWithAllowNewPackages(CmdL);
 
47
   else
 
48
      return DoUpgradeNoNewPackages(CmdL);
 
49
}
 
50
                                                                        /*}}}*/
42
51
// DoUpgradeNoNewPackages - Upgrade all packages                        /*{{{*/
43
52
// ---------------------------------------------------------------------
44
53
/* Upgrade all packages without installing new packages or erasing old