* pkgDirStream has (slightly) better extract support now

diff --git a/apt-inst/dirstream.cc b/apt-inst/dirstream.cc
index 7ae93c9b0c11b3779802d0e66efbbf03ae448348..898ede31b3c8dfe926e08325f32ddf5c6f6e2514 100644 (file)
--- a/apt-inst/dirstream.cc
+++ b/apt-inst/dirstream.cc
@@ -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;
    }

diff --git a/configure.in b/configure.in
index 6130ab544bca7d0729b927d141cc9ccb3bc9d718..bc5d2b5722d6d249f619f16fbf4224d424355869 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --

-AC_DEFINE_UNQUOTED(VERSION,"0.6.42.3")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.42.4")

 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

diff --git a/debian/changelog b/debian/changelog
index 2a636ae30f36b9aac88339467eaab246435f68e8..9115faabcac5dfb1e0d3b376dc2adb479715c531 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ apt (0.6.42.4) unstable; urgency=low
     * gl.po: Completed to 510 strings (Closes: #338356)
   * added support for "/etc/apt/sources.list.d" directory 
     (closes: #66325)
     * gl.po: Completed to 510 strings (Closes: #338356)
   * added support for "/etc/apt/sources.list.d" directory 
     (closes: #66325)

+  * make pkgDirStream (a bit) more complete

   
  --
 
   
  --