Updated Russian translation. Closes: #405476

[apt.git] / apt-inst / dirstream.cc

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index a8a4d9c0d628187d46ad51a827da9c8cc1eb0f57..898ede31b3c8dfe926e08325f32ddf5c6f6e2514 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -42,15 +42,15 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
         int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND,
                       Itm.Mode);
         if (iFd < 0)
         int iFd = open(Itm.Name,O_NDELAY|O_WRONLY|O_CREAT|O_TRUNC|O_APPEND,
                       Itm.Mode);
         if (iFd < 0)

-           return _error->Errno("open",_("Failed write file %s"),
+           return _error->Errno("open",_("Failed to write file %s"),

                                 Itm.Name);
         
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)
                                 Itm.Name);
         
         // fchmod deals with umask and fchown sets the ownership
         if (fchmod(iFd,Itm.Mode) != 0)

-           return _error->Errno("fchmod",_("Failed write file %s"),
+           return _error->Errno("fchmod",_("Failed to write file %s"),

                                 Itm.Name);
         if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)
                                 Itm.Name);
         if (fchown(iFd,Itm.UID,Itm.GID) != 0 && errno != EPERM)

-           return _error->Errno("fchown",_("Failed write file %s"),
+           return _error->Errno("fchown",_("Failed to write file %s"),

                                 Itm.Name);
         Fd = iFd;
         return true;
                                 Itm.Name);
         Fd = iFd;
         return true;


@@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
       case Item::CharDevice:
       case Item::BlockDevice:
       case Item::Directory:
       case Item::CharDevice:
       case Item::BlockDevice:
       case Item::Directory:

+      {
+        struct stat Buf;
+        // check if the dir is already there, if so return true
+        if (stat(Itm.Name,&Buf) == 0)
+        {
+           if(S_ISDIR(Buf.st_mode))
+              return true;
+           // something else is there already, return false
+           return false;
+        }
+        // nothing here, create the dir
+        if(mkdir(Itm.Name,Itm.Mode) < 0)
+           return false;
+        return true;
+        break;
+      }

       case Item::FIFO:
       break;
    }
       case Item::FIFO:
       break;
    }