test/test-indexes.sh: Stop hardcoding archive gpg key ID, get it from first failed...

[apt.git] / apt-pkg / depcache.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index ec7a5de647b341aae15d02dfd8787242043c0adc..0f30f13c244f824fb7aed35e6b836f7b1ca859d9 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -186,16 +186,16 @@ bool pkgDepCache::readStateFile(OpProgress *Prog)                 /*{{{*/
            if(reason > 0)
               PkgState[pkg->ID].Flags  |= Flag::Auto;
            if(debug_autoremove)
            if(reason > 0)
               PkgState[pkg->ID].Flags  |= Flag::Auto;
            if(debug_autoremove)

-              std::cout << "Auto-Installed : " << pkgname << std::endl;
+              std::clog << "Auto-Installed : " << pkgname << std::endl;

            amt+=section.size();
            if(Prog != NULL)
               Prog->OverallProgress(amt, file_size, 1, 
                                     _("Reading state information"));
         }
            amt+=section.size();
            if(Prog != NULL)
               Prog->OverallProgress(amt, file_size, 1, 
                                     _("Reading state information"));
         }

-        if(Prog != NULL)
-           Prog->OverallProgress(file_size, file_size, 1, 
-                                 _("Reading state information"));

       }
       }

+      if(Prog != NULL)
+        Prog->OverallProgress(file_size, file_size, 1,
+                              _("Reading state information"));

    }
 
    return true;
    }
 
    return true;


@@ -1511,7 +1511,7 @@ bool pkgDepCache::Sweep()                                         /*{{{*/
      {
        state.Garbage=true;
        if(debug_autoremove)
      {
        state.Garbage=true;
        if(debug_autoremove)

-          std::cout << "Garbage: " << p.Name() << std::endl;
+          std::clog << "Garbage: " << p.Name() << std::endl;

      }
   }   
 
      }
   }