first round of reorder code without changing result

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

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index d71b6fba746340ae1d2f71160e3ca06693a05f56..721ce9dc798c12c4728a66689ce47a8f4914ab41 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1697,7 +1697,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
 
    // we could have removed a new dependency of a garbage package,
    // so check if a reverse depends is broken and if so install it again.
 
    // we could have removed a new dependency of a garbage package,
    // so check if a reverse depends is broken and if so install it again.

-   if (tooMuch.empty() == false && Cache->BrokenCount() != 0)
+   if (tooMuch.empty() == false && (Cache->BrokenCount() != 0 || Cache->PolicyBrokenCount() != 0))

    {
       bool Changed;
       do {
    {
       bool Changed;
       do {


@@ -1708,8 +1708,8 @@ bool DoAutomaticRemove(CacheFile &Cache)
            for (pkgCache::DepIterator R = P.RevDependsList();
                 R.end() == false; ++R)
            {
            for (pkgCache::DepIterator R = P.RevDependsList();
                 R.end() == false; ++R)
            {

-              if (R->Type != pkgCache::Dep::Depends &&
-                  R->Type != pkgCache::Dep::PreDepends)
+              if (R.IsNegative() == true ||
+                  Cache->IsImportantDep(R) == false)

                  continue;
               pkgCache::PkgIterator N = R.ParentPkg();
               if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))
                  continue;
               pkgCache::PkgIterator N = R.ParentPkg();
               if (N.end() == true || (N->CurrentVer == 0 && (*Cache)[N].Install() == false))


@@ -1798,7 +1798,7 @@ bool DoInstall(CommandLine &CmdL)
       BrokenFix = true;
 
    pkgProblemResolver* Fix = NULL;
       BrokenFix = true;
 
    pkgProblemResolver* Fix = NULL;

-   if (_config->FindB("APT::Get::AutoSolving", true) == true)
+   if (_config->FindB("APT::Get::CallResolver", true) == true)

       Fix = new pkgProblemResolver(Cache);
 
    static const unsigned short MOD_REMOVE = 1;
       Fix = new pkgProblemResolver(Cache);
 
    static const unsigned short MOD_REMOVE = 1;


@@ -1852,7 +1852,7 @@ bool DoInstall(CommandLine &CmdL)
            RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction);
       }
 
            RemoveAction = std::for_each(verset[MOD_REMOVE].begin(), verset[MOD_REMOVE].end(), RemoveAction);
       }
 

-      if (Fix != NULL)
+      if (Fix != NULL && _config->FindB("APT::Get::AutoSolving", true) == true)

       {
          for (unsigned short i = 0; order[i] != 0; ++i)
          {
       {
          for (unsigned short i = 0; order[i] != 0; ++i)
          {


@@ -2050,8 +2050,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 +2086,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;


@@ -2363,8 +2366,7 @@ bool DoSource(CommandLine &CmdL)
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    pkgAcquire Fetcher;
    // Create the download object
    AcqTextStatus Stat(ScreenWidth,_config->FindI("quiet",0));   
    pkgAcquire Fetcher;

-   if (Fetcher.Setup(&Stat) == false)
-      return false;
+   Fetcher.SetLog(&Stat);

 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    
 
    DscFile *Dsc = new DscFile[CmdL.FileSize()];
    


@@ -2386,8 +2388,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 +2422,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 +2486,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 +2500,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 +2540,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 +2558,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 +2653,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;
 


@@ -2707,6 +2725,16 @@ bool DoBuildDep(CommandLine &CmdL)
 
          if (skipAlternatives == true)
          {
 
          if (skipAlternatives == true)
          {

+            /*
+             * if there are alternatives, we've already picked one, so skip
+             * the rest
+             *
+             * TODO: this means that if there's a build-dep on A|B and B is
+             * installed, we'll still try to install A; more importantly,
+             * if A is currently broken, we cannot go back and try B. To fix 
+             * this would require we do a Resolve cycle for each package we 
+             * add to the install list. Ugh
+             */

             if (!hasAlternatives)
                skipAlternatives = false; // end of or group
             continue;
             if (!hasAlternatives)
                skipAlternatives = false; // end of or group
             continue;


@@ -2715,27 +2743,29 @@ bool DoBuildDep(CommandLine &CmdL)
          if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||
             (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
          {
          if ((*D).Type == pkgSrcRecords::Parser::BuildConflict ||
             (*D).Type == pkgSrcRecords::Parser::BuildConflictIndep)
          {

-            pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);
+            pkgCache::GrpIterator Grp = Cache->FindGrp((*D).Package);

             // Build-conflicts on unknown packages are silently ignored
             // Build-conflicts on unknown packages are silently ignored

-            if (Pkg.end() == true)
+            if (Grp.end() == true)

                continue;
 
                continue;
 

-            pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
-
-            /* 
-             * Remove if we have an installed version that satisfies the 
-             * version criteria
-             */
-            if (IV.end() == false && 
-                Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
-               TryToInstallBuildDep(Pkg,Cache,Fix,true,false);
+           for (pkgCache::PkgIterator Pkg = Grp.PackageList(); Pkg.end() == false; Pkg = Grp.NextPkg(Pkg))
+           {
+              pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);
+              /*
+               * Remove if we have an installed version that satisfies the
+               * version criteria
+               */
+              if (IV.end() == false &&
+                  Cache->VS().CheckDep(IV.VerStr(),(*D).Op,(*D).Version.c_str()) == true)
+                 TryToInstallBuildDep(Pkg,Cache,Fix,true,false);
+           }

          }
         else // BuildDep || BuildDepIndep
          {
          }
         else // BuildDep || BuildDepIndep
          {

-           pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);

             if (_config->FindB("Debug::BuildDeps",false) == true)
                  cout << "Looking for " << (*D).Package << "...\n";
 
             if (_config->FindB("Debug::BuildDeps",false) == true)
                  cout << "Looking for " << (*D).Package << "...\n";
 

+           pkgCache::PkgIterator Pkg = Cache->FindPkg((*D).Package);

            if (Pkg.end() == true)
             {
                if (_config->FindB("Debug::BuildDeps",false) == true)
            if (Pkg.end() == true)
             {
                if (_config->FindB("Debug::BuildDeps",false) == true)


@@ -2750,34 +2780,6 @@ bool DoBuildDep(CommandLine &CmdL)
                                     (*D).Package.c_str());
             }
 
                                     (*D).Package.c_str());
             }
 

-            /*
-             * if there are alternatives, we've already picked one, so skip
-             * the rest
-             *
-             * TODO: this means that if there's a build-dep on A|B and B is
-             * installed, we'll still try to install A; more importantly,
-             * if A is currently broken, we cannot go back and try B. To fix 
-             * this would require we do a Resolve cycle for each package we 
-             * add to the install list. Ugh
-             */
-                       
-           /* 
-            * If this is a virtual package, we need to check the list of
-            * packages that provide it and see if any of those are
-            * installed
-            */
-            pkgCache::PrvIterator Prv = Pkg.ProvidesList();
-            for (; Prv.end() != true; Prv++)
-           {
-               if (_config->FindB("Debug::BuildDeps",false) == true)
-                    cout << "  Checking provider " << Prv.OwnerPkg().FullName() << endl;
-
-              if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
-                 break;
-            }
-            
-            // Get installed version and version we are going to install
-           pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);

 
             if ((*D).Version[0] != '\0') {
                  // Versioned dependency
 
             if ((*D).Version[0] != '\0') {
                  // Versioned dependency


@@ -2807,6 +2809,21 @@ bool DoBuildDep(CommandLine &CmdL)
             }
             else
             {
             }
             else
             {

+              /*
+               * If this is a virtual package, we need to check the list of
+               * packages that provide it and see if any of those are
+               * installed
+               */
+              pkgCache::PrvIterator Prv = Pkg.ProvidesList();
+              for (; Prv.end() != true; Prv++)
+              {
+                 if (_config->FindB("Debug::BuildDeps",false) == true)
+                    cout << "  Checking provider " << Prv.OwnerPkg().FullName() << endl;
+
+                 if ((*Cache)[Prv.OwnerPkg()].InstVerIter(*Cache).end() == false)
+                    break;
+              }
+

                // Only consider virtual packages if there is no versioned dependency
                if (Prv.end() == false)
                {
                // Only consider virtual packages if there is no versioned dependency
                if (Prv.end() == false)
                {


@@ -2817,6 +2834,7 @@ bool DoBuildDep(CommandLine &CmdL)
                }
             }
 
                }
             }
 

+           pkgCache::VerIterator IV = (*Cache)[Pkg].InstVerIter(*Cache);

             if (IV.end() == false)
             {
                if (_config->FindB("Debug::BuildDeps",false) == true)
             if (IV.end() == false)
             {
                if (_config->FindB("Debug::BuildDeps",false) == true)


@@ -3168,8 +3186,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"