replace "filesize - 1" trick in http with proper 416 handling

[apt.git] / apt-private / private-upgrade.cc

diff --git a/apt-private/private-upgrade.cc b/apt-private/private-upgrade.cc
index eb546e3e3dd6d45268081a2c519e5c1d96e100d0..9a5286b57fc26e2b88678ed4a3492a7ae09ecbde 100644 (file)
--- a/apt-private/private-upgrade.cc
+++ b/apt-private/private-upgrade.cc
@@ -1,21 +1,18 @@
-
+// Includes                                                            /*{{{*/

 #include <apt-pkg/algorithms.h>
 
 #include "private-install.h"
 #include "private-cachefile.h"
 #include "private-upgrade.h"
 #include "private-output.h"
 #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                       /*{{{*/
+// DoUpgradeNoNewPackages - Upgrade all packages                       /*{{{*/

 // ---------------------------------------------------------------------
 /* Upgrade all packages without installing new packages or erasing old
    packages */
 bool DoUpgradeNoNewPackages(CommandLine &CmdL)
 {
 // ---------------------------------------------------------------------
 /* 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;
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;


@@ -26,17 +23,17 @@ bool DoUpgradeNoNewPackages(CommandLine &CmdL)
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
    }
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
    }

+
+   // parse additional cmdline pkg manipulation switches
+   if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
+      return false;

    
    return InstallPackages(Cache,true);
 }
                                                                        /*}}}*/
    
    return InstallPackages(Cache,true);
 }
                                                                        /*}}}*/

-

 // DoSafeUpgrade - Upgrade all packages with install but not remove    /*{{{*/
 bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL)
 {
 // 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;
    CacheFile Cache;
    if (Cache.OpenForInstall() == false || Cache.CheckDeps() == false)
       return false;


@@ -47,6 +44,10 @@ bool DoUpgradeWithAllowNewPackages(CommandLine &CmdL)
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
    }
       ShowBroken(c1out,Cache,false);
       return _error->Error(_("Internal error, AllUpgrade broke stuff"));
    }

+
+   // parse additional cmdline pkg manipulation switches
+   if(!DoCacheManipulationFromCommandLine(CmdL, Cache))
+      return false;

    
    return InstallPackages(Cache,true);
 }
    
    return InstallPackages(Cache,true);
 }