wok-next diff busybox/stuff/busybox-1.17.3-cpio-mkdir.u @ rev 6837
Add mupdf: mv from undigest ( also need to check if all dependencies for ardour/openshot are moved to wok)
author | Rohit Joshi <jozee@slitaz.org> |
---|---|
date | Tue Oct 19 21:30:50 2010 -0400 (2010-10-19) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/busybox/stuff/busybox-1.17.3-cpio-mkdir.u Tue Oct 19 21:30:50 2010 -0400 1.3 @@ -0,0 +1,33 @@ 1.4 +avoid 'not created: newer or same age file exists' message for directories 1.5 +--- busybox-1.17.1/archival/libunarchive/data_extract_all.c 1.6 ++++ busybox-1.17.1/archival/libunarchive/data_extract_all.c 1.7 +@@ -69,7 +69,8 @@ 1.8 + } 1.9 + } 1.10 + else if (existing_sb.st_mtime >= file_header->mtime) { 1.11 +- if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { 1.12 ++ if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET) 1.13 ++ && (file_header->mode & S_IFMT) != S_IFDIR) { 1.14 + bb_error_msg("%s not created: newer or " 1.15 + "same age file exists", file_header->name); 1.16 + } 1.17 + 1.18 +--- busybox-1.17.1/testsuite/cpio.tests 1.19 ++++ busybox-1.17.1/testsuite/cpio.tests 1.20 +@@ -114,6 +114,16 @@ 1.21 + " "" "" 1.22 + SKIP= 1.23 + 1.24 ++# avoid 'not created: newer or same age file exists' message for directories 1.25 ++rm -rf cpio.testdir cpio.testdir2 2>/dev/null 1.26 ++mkdir cpio.testdir 1.27 ++testing "cpio extracts in existing directory" \ 1.28 ++"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \ 1.29 ++"\ 1.30 ++1 blocks 1.31 ++0 1.32 ++" "" "" 1.33 ++SKIP= 1.34 + 1.35 + # Clean up 1.36 + rm -rf cpio.testdir cpio.testdir2 2>/dev/null