emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cpio: avoid 'not created: newer or same age file exists' message for dirs

Browse Source 
Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Pascal Bellard 2010-10-18 00:54:51 +02:00 committed by Denys Vlasenko
parent cadf90184c
commit 873bb31d17
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/libunarchive/data_extract_all.c
View File

@ -69,7 +69,9 @@ void FAST_FUNC data_extract_all(archive_handle_t *archive_handle)
} }
} }
else if (existing_sb.st_mtime >= file_header->mtime) { else if (existing_sb.st_mtime >= file_header->mtime) {
if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)) { if (!(archive_handle->ah_flags & ARCHIVE_EXTRACT_QUIET)
&& !S_ISDIR(file_header->mode)
) {
bb_error_msg("%s not created: newer or " bb_error_msg("%s not created: newer or "
"same age file exists", file_header->name); "same age file exists", file_header->name);
} }

10
testsuite/cpio.tests
View File

@ -116,6 +116,16 @@ link
" "" "" " "" ""
SKIP= SKIP=
# avoid 'not created: newer or same age file exists' message for directories
rm -rf cpio.testdir cpio.testdir2 2>/dev/null
mkdir cpio.testdir
testing "cpio extracts in existing directory" \
"$ECHO -ne '$hexdump' | bzcat | cpio -id 2>&1; echo \$?" \
"\
1 blocks
0
" "" ""
SKIP=
# Clean up # Clean up
rm -rf cpio.testdir cpio.testdir2 2>/dev/null rm -rf cpio.testdir cpio.testdir2 2>/dev/null