remove no longer needed replaces for libapt-pkg4.11 and libapt-inst1.3

[apt.git] / cmdline / apt-get.cc

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 6ffecd777cb91b98c73c74f3ce5026f945633b02..66ebd30b817ee0e9cd8e8c8ee9cdd79f460e716c 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1886,8 +1886,7 @@ bool DoInstall(CommandLine &CmdL)
       {
         // Call the scored problem resolver
         Fix->InstallProtect();
       {
         // Call the scored problem resolver
         Fix->InstallProtect();

-        if (Fix->Resolve(true) == false)
-           _error->Discard();
+        Fix->Resolve(true);

         delete Fix;
       }
 
         delete Fix;
       }
 


@@ -1913,8 +1912,11 @@ bool DoInstall(CommandLine &CmdL)
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
         ShowBroken(c1out,Cache,false);
         c1out << _("The following information may help to resolve the situation:") << endl;
         c1out << endl;
         ShowBroken(c1out,Cache,false);

-        return _error->Error(_("Broken packages"));
-      }   
+        if (_error->PendingError() == true)
+           return false;
+        else
+           return _error->Error(_("Broken packages"));
+      }

    }
    if (!DoAutomaticRemove(Cache)) 
       return false;
    }
    if (!DoAutomaticRemove(Cache)) 
       return false;


@@ -2050,8 +2052,8 @@ bool DoInstall(CommandLine &CmdL)
 
    return InstallPackages(Cache,false);   
 }
 
    return InstallPackages(Cache,false);   
 }

-
-/* mark packages as automatically/manually installed. */
+                                                                       /*}}}*/
+/* mark packages as automatically/manually installed.                  {{{*/

 bool DoMarkAuto(CommandLine &CmdL)
 {
    bool Action = true;
 bool DoMarkAuto(CommandLine &CmdL)
 {
    bool Action = true;


@@ -2086,6 +2088,9 @@ bool DoMarkAuto(CommandLine &CmdL)
          AutoMarkChanged++;
       }
    }
          AutoMarkChanged++;
       }
    }

+
+   _error->Notice(_("This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' instead."));
+

    if (AutoMarkChanged && ! _config->FindB("APT::Get::Simulate",false))
       return Cache->writeStateFile(NULL);
    return false;
    if (AutoMarkChanged && ! _config->FindB("APT::Get::Simulate",false))
       return Cache->writeStateFile(NULL);
    return false;


@@ -2294,6 +2299,8 @@ bool DoDownload(CommandLine &CmdL)
       strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
       // get the most appropriate hash
       HashString hash;
       strprintf(descr, _("Downloading %s %s"), Pkg.Name(), Ver.VerStr());
       // get the most appropriate hash
       HashString hash;

+      if (rec.SHA512Hash() != "")
+         hash = HashString("sha512", rec.SHA512Hash());

       if (rec.SHA256Hash() != "")
          hash = HashString("sha256", rec.SHA256Hash());
       else if (rec.SHA1Hash() != "")
       if (rec.SHA256Hash() != "")
          hash = HashString("sha256", rec.SHA256Hash());
       else if (rec.SHA1Hash() != "")


@@ -2386,8 +2393,10 @@ bool DoSource(CommandLine &CmdL)
       string Src;
       pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,*Cache);
       
       string Src;
       pkgSrcRecords::Parser *Last = FindSrc(*I,Recs,SrcRecs,Src,*Cache);
       

-      if (Last == 0)
+      if (Last == 0) {
+        delete[] Dsc;

         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());
         return _error->Error(_("Unable to find a source package for %s"),Src.c_str());

+      }

       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");
       
       string srec = Last->AsStr();
       string::size_type pos = srec.find("\nVcs-");


@@ -2418,8 +2427,10 @@ bool DoSource(CommandLine &CmdL)
 
       // Back track
       vector<pkgSrcRecords::File> Lst;
 
       // Back track
       vector<pkgSrcRecords::File> Lst;

-      if (Last->Files(Lst) == false)
+      if (Last->Files(Lst) == false) {
+        delete[] Dsc;

         return false;
         return false;

+      }

 
       // Load them into the fetcher
       for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
 
       // Load them into the fetcher
       for (vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();


@@ -2480,6 +2491,7 @@ bool DoSource(CommandLine &CmdL)
    struct statvfs Buf;
    string OutputDir = ".";
    if (statvfs(OutputDir.c_str(),&Buf) != 0) {
    struct statvfs Buf;
    string OutputDir = ".";
    if (statvfs(OutputDir.c_str(),&Buf) != 0) {

+      delete[] Dsc;

       if (errno == EOVERFLOW)
         return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
                                OutputDir.c_str());
       if (errno == EOVERFLOW)
         return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
                                OutputDir.c_str());


@@ -2493,10 +2505,12 @@ bool DoSource(CommandLine &CmdL)
 #if HAVE_STRUCT_STATFS_F_TYPE
            || unsigned(Stat.f_type) != RAMFS_MAGIC
 #endif
 #if HAVE_STRUCT_STATFS_F_TYPE
            || unsigned(Stat.f_type) != RAMFS_MAGIC
 #endif

-           ) 
+           )  {
+        delete[] Dsc;

           return _error->Error(_("You don't have enough free space in %s"),
               OutputDir.c_str());
           return _error->Error(_("You don't have enough free space in %s"),
               OutputDir.c_str());

-      }
+       }
+     }

    
    // Number of bytes
    if (DebBytes != FetchBytes)
    
    // Number of bytes
    if (DebBytes != FetchBytes)


@@ -2531,7 +2545,10 @@ bool DoSource(CommandLine &CmdL)
    
    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)
    
    // Run it
    if (Fetcher.Run() == pkgAcquire::Failed)

+   {
+      delete[] Dsc;

       return false;
       return false;

+   }

 
    // Print error messages
    bool Failed = false;
 
    // Print error messages
    bool Failed = false;


@@ -2546,8 +2563,11 @@ bool DoSource(CommandLine &CmdL)
       Failed = true;
    }
    if (Failed == true)
       Failed = true;
    }
    if (Failed == true)

+   {
+      delete[] Dsc;

       return _error->Error(_("Failed to fetch some archives."));
       return _error->Error(_("Failed to fetch some archives."));

-   
+   }
+

    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;


@@ -2638,6 +2658,9 @@ bool DoSource(CommandLine &CmdL)
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;
 bool DoBuildDep(CommandLine &CmdL)
 {
    CacheFile Cache;

+
+   _config->Set("APT::Install-Recommends", false);
+   

    if (Cache.Open(true) == false)
       return false;
 
    if (Cache.Open(true) == false)
       return false;
 


@@ -3168,8 +3191,6 @@ bool ShowHelp(CommandLine &CmdL)
       "   clean - Erase downloaded archive files\n"
       "   autoclean - Erase old downloaded archive files\n"
       "   check - Verify that there are no broken dependencies\n"
       "   clean - Erase downloaded archive files\n"
       "   autoclean - Erase old downloaded archive files\n"
       "   check - Verify that there are no broken dependencies\n"

-      "   markauto - Mark the given packages as automatically installed\n"
-      "   unmarkauto - Mark the given packages as manually installed\n"

       "   changelog - Download and display the changelog for the given package\n"
       "   download - Download the binary package into the current directory\n"
       "\n"
       "   changelog - Download and display the changelog for the given package\n"
       "   download - Download the binary package into the current directory\n"
       "\n"


@@ -3253,6 +3274,7 @@ int main(int argc,const char *argv[])                                     /*{{{*/
       {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
       {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
       {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},
       {0,"install-recommends","APT::Install-Recommends",CommandLine::Boolean},
       {0,"install-suggests","APT::Install-Suggests",CommandLine::Boolean},
       {0,"fix-policy","APT::Get::Fix-Policy-Broken",0},

+      {0,"solver","APT::Solver",CommandLine::HasArg},

       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};
       {'c',"config-file",0,CommandLine::ConfigFile},
       {'o',"option",0,CommandLine::ArbItem},
       {0,0,0,0}};