瀏覽代碼

* pkgDirStream has (slightly) better extract support now

Michael Vogt 20 年之前
父節點
當前提交
f2047f6b2a
共有 3 個文件被更改,包括 18 次插入1 次删除
  1. 16 0
      apt-inst/dirstream.cc
  2. 1 1
      configure.in
  3. 1 0
      debian/changelog

+ 16 - 0
apt-inst/dirstream.cc

@@ -61,6 +61,22 @@ bool pkgDirStream::DoItem(Item &Itm,int &Fd)
       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;
    }

+ 1 - 1
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_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)

+ 1 - 0
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)
+  * make pkgDirStream (a bit) more complete
   
  --