Merge branch 'debian/sid' into debian/experimental

Conflicts:
	cmdline/apt-get.cc
	debian/changelog

1 files changed, 53 insertions, 0 deletions

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
new file mode 100644
index 000000000..eb546e3e3
--- /dev/null
+++ b/apt-private/private-upgrade.cc
@@ -0,0 +1,53 @@
+
+#include <apt-pkg/algorithms.h>
+
+#include "private-install.h"
+#include "private-cachefile.h"
+#include "private-upgrade.h"
+#include "private-output.h"
+
+
+// DoUpgradeNoNewPackages - Upgrade all packages        		/*{{{*/
+// ---------------------------------------------------------------------
+/* Upgrade all packages without installing new packages or erasing old
+   packages */
+bool DoUpgradeNoNewPackages(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() != 1)
+      return _error->Error(_("The upgrade command takes no arguments"));
+
+   CacheFile Cache;
+   if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
+      return false;
+
+   // Do the upgrade
+   if (pkgAllUpgrade(Cache) == false)
+   {
+      ShowBroken(c1out,Cache,false);
+      return _error->Error(_("Internal error, AllUpgrade broke stuff"));
+   }
+   
+   return InstallPackages(Cache,true);
+}
+									/*}}}*/
+
+// DoSafeUpgrade - Upgrade all packages with install but not remove	/*{{{*/
+bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL)
+{
+   if (CmdL.FileSize() != 1)
+      return _error->Error(_("The upgrade command takes no arguments"));
+
+   CacheFile Cache;
+   if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
+      return false;
+
+   // Do the upgrade
+   if (pkgAllUpgradeNoDelete(Cache) == false)
+   {
+      ShowBroken(c1out,Cache,false);
+      return _error->Error(_("Internal error, AllUpgrade broke stuff"));
+   }
+   
+   return InstallPackages(Cache,true);
+}
+									/*}}}*/