merged from lp:~donkult/apt/sid

[apt.git] / apt-inst / deb / dpkgdb.cc

diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index 7da5a26aaabdbb7ec5f9c7abfa604ff2e24e6910..a75cf59ca5858ab533de5f203c9222b1e02f0563 100644 (file)
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -13,10 +13,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/dpkgdb.h"
-#endif
-
 #include <apt-pkg/dpkgdb.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
@@ -67,7 +63,7 @@ static bool EraseDir(const char *Dir)
    if (Pid == 0)
    {
       execlp(_config->Find("Dir::Bin::rm","/bin/rm").c_str(),
-            "rm","-rf","--",Dir,0);
+            "rm","-rf","--",Dir,(char *)NULL);
       _exit(100);
    }
    return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());
@@ -136,7 +132,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
 {
    if (Cache != 0)
    {  
-      Progress.OverallProgress(1,1,1,_("Reading Package Lists"));      
+      Progress.OverallProgress(1,1,1,_("Reading package lists"));      
       return true;
    }
    
@@ -146,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
       CacheMap = 0;
    }
    
-   if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false)
+   if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false)
       return false;
    Cache->DropProgress();
    
@@ -198,11 +194,11 @@ bool debDpkgDB::ReadFList(OpProgress &Progress)
       pkgFLCache::PkgIterator FlPkg = FList->GetPkg(I.Name(),0,true);
       if (FlPkg.end() == true)
       {
-        _error->Error(_("Internal Error getting a Package Name"));
+        _error->Error(_("Internal error getting a package name"));
         break;
       }
       
-      Progress.OverallProgress(Count,Total,1,_("Reading File Listing"));
+      Progress.OverallProgress(Count,Total,1,_("Reading file listing"));
      
       // Open the list file
       snprintf(Name,sizeof(Name),"%s.list",I.Name());
@@ -263,7 +259,7 @@ bool debDpkgDB::ReadFList(OpProgress &Progress)
                                              FlPkg.Offset(),true,false);
            if (Node.end() == true)
            {
-              _error->Error(_("Internal Error getting a Node"));
+              _error->Error(_("Internal error getting a node"));
               break;
            }
         }
@@ -352,14 +348,14 @@ bool debDpkgDB::ReadDiversions()
       pkgFLCache::PkgIterator FlPkg = FList->GetPkg(Package,0,true);
       if (FlPkg.end() == true)
       {
-        _error->Error(_("Internal Error getting a Package Name"));
+        _error->Error(_("Internal error getting a package name"));
         break;
       }
       
       // Install the diversion
       if (FList->AddDiversion(FlPkg,From,To) == false)
       {
-        _error->Error(_("Internal Error adding a diversion"));
+        _error->Error(_("Internal error adding a diversion"));
         break;
       }
    }
@@ -380,10 +376,10 @@ bool debDpkgDB::ReadDiversions()
 bool debDpkgDB::ReadyFileList(OpProgress &Progress)
 {
    if (Cache == 0)
-      return _error->Error(_("The pkg cache must be initialize first"));
+      return _error->Error(_("The pkg cache must be initialized first"));
    if (FList != 0)
    {
-      Progress.OverallProgress(1,1,1,_("Reading File List"));
+      Progress.OverallProgress(1,1,1,_("Reading file listing"));
       return true;
    }
    
@@ -440,12 +436,12 @@ bool debDpkgDB::ReadConfFiles()
       const char *PkgStart;
       const char *PkgEnd;
       if (Section.Find("Package",PkgStart,PkgEnd) == false)
-        return _error->Error(_("Failed to find a Package: Header, offset %lu"),Offset);
+        return _error->Error(_("Failed to find a Package: header, offset %lu"),Offset);
 
       // Snag a package record for it
       pkgFLCache::PkgIterator FlPkg = FList->GetPkg(PkgStart,PkgEnd,true);
       if (FlPkg.end() == true)
-        return _error->Error(_("Internal Error getting a Package Name"));
+        return _error->Error(_("Internal error getting a package name"));
 
       // Parse the conf file lines
       while (1)