Merge branch 'debian/sid' into debian/experimental

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index c24a96cdfa2d87152287e8c2c7ef30d15befba70..92a4429e5789a408a7b4c8350b11300c3c18327e 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -77,7 +77,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
                {0,0,0,0}};
 
         // we really don't need anything
                {0,0,0,0}};
 
         // we really don't need anything

-        DropPrivs();
+        DropPrivileges();

 
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||
 
        CommandLine CmdL(Args,_config);
        if (pkgInitConfig(*_config) == false ||


@@ -175,10 +175,10 @@ int main(int argc,const char *argv[])                                     /*{{{*/
 
        std::string failure;
        if (upgrade == true) {
 
        std::string failure;
        if (upgrade == true) {

-               if (pkgAllUpgrade(CacheFile) == false)
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)

                        failure = "ERR_UNSOLVABLE_UPGRADE";
        } else if (distUpgrade == true) {
                        failure = "ERR_UNSOLVABLE_UPGRADE";
        } else if (distUpgrade == true) {

-               if (pkgDistUpgrade(CacheFile) == false)
+               if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::ALLOW_EVERYTHING) == false)

                        failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
        } else if (Fix.Resolve() == false)
                failure = "ERR_UNSOLVABLE";
                        failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
        } else if (Fix.Resolve() == false)
                failure = "ERR_UNSOLVABLE";