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 de781f44c4c6a29ae2539dd30551c6f71073b077..a75cf59ca5858ab533de5f203c9222b1e02f0563 100644 (file)
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -13,10 +13,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // 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>
 #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(),
    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());
       _exit(100);
    }
    return ExecWait(Pid,_config->Find("dir::bin::rm","/bin/rm").c_str());


@@ -146,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
       CacheMap = 0;
    }
    
       CacheMap = 0;
    }
    

-   if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false)
+   if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false)

       return false;
    Cache->DropProgress();
    
       return false;
    Cache->DropProgress();
    


@@ -380,10 +376,10 @@ bool debDpkgDB::ReadDiversions()
 bool debDpkgDB::ReadyFileList(OpProgress &Progress)
 {
    if (Cache == 0)
 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)
    {
    if (FList != 0)
    {

-      Progress.OverallProgress(1,1,1,_("Reading file list"));
+      Progress.OverallProgress(1,1,1,_("Reading file listing"));

       return true;
    }
    
       return true;
    }