reduce delta from ubuntu

[apt.git] / apt-pkg / deb / debsystem.cc

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 089a465c13814dbc99412ce88a81a787f60a2384..142f3a6e65dacbdc3fedc322bd30131f4bf014ad 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -10,6 +10,8 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

+#include <config.h>
+

 #include <apt-pkg/debsystem.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debsystem.h>
 #include <apt-pkg/debversion.h>
 #include <apt-pkg/debindexfile.h>


@@ -17,24 +19,43 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

-#include <apti18n.h>
-#include <sys/types.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cacheiterators.h>
+
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <vector>

 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>

+
+#include <apti18n.h>

                                                                        /*}}}*/
 
                                                                        /*}}}*/
 

+using std::string;
+

 debSystem debSys;
 
 debSystem debSys;
 

+class debSystemPrivate {
+public:
+   debSystemPrivate() : LockFD(-1), LockCount(0), StatusFile(0)
+   {
+   }
+   // For locking support
+   int LockFD;
+   unsigned LockCount;
+   
+   debStatusIndex *StatusFile;
+};
+

 // System::debSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debSystem::debSystem()
 {
 // System::debSystem - Constructor                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 debSystem::debSystem()
 {

-   LockFD = -1;
-   LockCount = 0;
-   StatusFile = 0;
-   
+   d = new debSystemPrivate();

    Label = "Debian dpkg interface";
    VS = &debVS;
 }
    Label = "Debian dpkg interface";
    VS = &debVS;
 }


@@ -44,7 +65,8 @@ debSystem::debSystem()
 /* */
 debSystem::~debSystem()
 {
 /* */
 debSystem::~debSystem()
 {

-   delete StatusFile;
+   delete d->StatusFile;
+   delete d;

 }
                                                                        /*}}}*/
 // System::Lock - Get the lock                                         /*{{{*/
 }
                                                                        /*}}}*/
 // System::Lock - Get the lock                                         /*{{{*/


@@ -54,16 +76,16 @@ debSystem::~debSystem()
 bool debSystem::Lock()
 {
    // Disable file locking
 bool debSystem::Lock()
 {
    // Disable file locking

-   if (_config->FindB("Debug::NoLocking",false) == true || LockCount > 1)
+   if (_config->FindB("Debug::NoLocking",false) == true || d->LockCount > 1)

    {
    {

-      LockCount++;
+      d->LockCount++;

       return true;
    }
 
    // Create the lockfile
    string AdminDir = flNotFile(_config->Find("Dir::State::status"));
       return true;
    }
 
    // Create the lockfile
    string AdminDir = flNotFile(_config->Find("Dir::State::status"));

-   LockFD = GetLock(AdminDir + "lock");
-   if (LockFD == -1)
+   d->LockFD = GetLock(AdminDir + "lock");
+   if (d->LockFD == -1)

    {
       if (errno == EACCES || errno == EAGAIN)
         return _error->Error(_("Unable to lock the administration directory (%s), "
    {
       if (errno == EACCES || errno == EAGAIN)
         return _error->Error(_("Unable to lock the administration directory (%s), "


@@ -76,13 +98,20 @@ bool debSystem::Lock()
    // See if we need to abort with a dirty journal
    if (CheckUpdates() == true)
    {
    // See if we need to abort with a dirty journal
    if (CheckUpdates() == true)
    {

-      close(LockFD);
-      LockFD = -1;
+      close(d->LockFD);
+      d->LockFD = -1;
+      const char *cmd;
+      if (getenv("SUDO_USER") != NULL)
+        cmd = "sudo dpkg --configure -a";
+      else
+        cmd = "dpkg --configure -a";
+      // TRANSLATORS: the %s contains the recovery command, usually
+      //              dpkg --configure -a

       return _error->Error(_("dpkg was interrupted, you must manually "
       return _error->Error(_("dpkg was interrupted, you must manually "

-                             "run 'sudo dpkg --configure -a' to correct the problem. "));
+                             "run '%s' to correct the problem. "), cmd);

    }
 
    }
 

-        LockCount++;
+        d->LockCount++;

       
    return true;
 }
       
    return true;
 }


@@ -92,15 +121,15 @@ bool debSystem::Lock()
 /* */
 bool debSystem::UnLock(bool NoErrors)
 {
 /* */
 bool debSystem::UnLock(bool NoErrors)
 {

-   if (LockCount == 0 && NoErrors == true)
+   if (d->LockCount == 0 && NoErrors == true)

       return false;
    
       return false;
    

-   if (LockCount < 1)
+   if (d->LockCount < 1)

       return _error->Error(_("Not locked"));
       return _error->Error(_("Not locked"));

-   if (--LockCount == 0)
+   if (--d->LockCount == 0)

    {
    {

-      close(LockFD);
-      LockCount = 0;
+      close(d->LockFD);
+      d->LockCount = 0;

    }
    
    return true;
    }
    
    return true;


@@ -157,13 +186,13 @@ bool debSystem::Initialize(Configuration &Cnf)
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */
    /* These really should be jammed into a generic 'Local Database' engine
       which is yet to be determined. The functions in pkgcachegen should
       be the only users of these */

-   Cnf.CndSet("Dir::State::userstatus","status.user"); // Defunct
+   Cnf.CndSet("Dir::State::extended_states", "extended_states");

    Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 
    Cnf.CndSet("Dir::State::status","/var/lib/dpkg/status");
    Cnf.CndSet("Dir::Bin::dpkg","/usr/bin/dpkg");
 

-   if (StatusFile) {
-     delete StatusFile;
-     StatusFile = 0;
+   if (d->StatusFile) {
+     delete d->StatusFile;
+     d->StatusFile = 0;

    }
 
    return true;
    }
 
    return true;


@@ -171,9 +200,9 @@ bool debSystem::Initialize(Configuration &Cnf)
                                                                        /*}}}*/
 // System::ArchiveSupported - Is a file format supported               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // System::ArchiveSupported - Is a file format supported               /*{{{*/
 // ---------------------------------------------------------------------

-/* The standard name for a deb is 'deb'.. There are no seperate versions
+/* The standard name for a deb is 'deb'.. There are no separate versions

    of .deb to worry about.. */
    of .deb to worry about.. */

-bool debSystem::ArchiveSupported(const char *Type)
+APT_PURE bool debSystem::ArchiveSupported(const char *Type)

 {
    if (strcmp(Type,"deb") == 0)
       return true;
 {
    if (strcmp(Type,"deb") == 0)
       return true;


@@ -199,11 +228,11 @@ signed debSystem::Score(Configuration const &Cnf)
 // System::AddStatusFiles - Register the status files                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // System::AddStatusFiles - Register the status files                  /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
+bool debSystem::AddStatusFiles(std::vector<pkgIndexFile *> &List)

 {
 {

-   if (StatusFile == 0)
-      StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
-   List.push_back(StatusFile);
+   if (d->StatusFile == 0)
+      d->StatusFile = new debStatusIndex(_config->FindFile("Dir::State::status"));
+   List.push_back(d->StatusFile);

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -213,11 +242,11 @@ bool debSystem::AddStatusFiles(vector<pkgIndexFile *> &List)
 bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const
 {
 bool debSystem::FindIndex(pkgCache::PkgFileIterator File,
                          pkgIndexFile *&Found) const
 {

-   if (StatusFile == 0)
+   if (d->StatusFile == 0)

       return false;
       return false;

-   if (StatusFile->FindInCache(*File.Cache()) == File)
+   if (d->StatusFile->FindInCache(*File.Cache()) == File)

    {
    {

-      Found = StatusFile;
+      Found = d->StatusFile;

       return true;
    }
    
       return true;
    }