diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-25 22:40:04 +0100 |
| commit | 6fa5b7b71e5c8ec5d4bec7bec3ef311c4d9c826b (patch) | |
| tree | a02ec2b10f30e713eedd3f7c63cc44051fb6c859 /cmdline/apt-get.cc | |
| parent | 72af508bdbca55d0752aab3369faa1dc944a04e7 (diff) | |
| parent | 9aef3908c892f9d9349d8bf8a5ceaeea313ba0fe (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
configure.ac
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index a5bc7b5fb..469e8f593 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1682,14 +1682,6 @@ void SigWinch(int) #endif } /*}}}*/ -bool DoUpgrade(CommandLine &CmdL) /*{{{*/ -{ - if (_config->FindB("APT::Get::Upgrade-Allow-New", false) == true) - return DoUpgradeWithAllowNewPackages(CmdL); - else - return DoUpgradeNoNewPackages(CmdL); -} - /*}}}*/ int main(int argc,const char *argv[]) /*{{{*/ { CommandLine::Dispatch Cmds[] = {{"update",&DoUpdate}, |