Fix spurious diagnostic during extraction of . with --keep-newer-files
Bug reported in https://savannah.gnu.org/bugs/?65838. Bug introduced by79d1ac38c1. * src/extract.c (make_directories): Restore second argument. This reverts the change made in79d1ac38c1. (maybe_recoverable, rename_directory): Update calls to make_directories. * tests/extrac27.at: New file. * tests/Makefile.am: Add new test. * tests/testsuite.at: Likewise.
This commit is contained in:
@@ -136,6 +136,7 @@ TESTSUITE_AT = \
|
||||
extrac24.at\
|
||||
extrac25.at\
|
||||
extrac26.at\
|
||||
extrac27.at\
|
||||
filerem01.at\
|
||||
filerem02.at\
|
||||
grow.at\
|
||||
|
||||
46
tests/extrac27.at
Normal file
46
tests/extrac27.at
Normal file
@@ -0,0 +1,46 @@
|
||||
# Test suite for GNU tar. -*- autotest -*-
|
||||
# Copyright 2024 Free Software Foundation, Inc.
|
||||
#
|
||||
# This file is part of GNU tar.
|
||||
#
|
||||
# GNU tar is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# GNU tar is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Description: When called with --keep-newer-files, tar 1.35 issued
|
||||
# spurious diagnostic message:
|
||||
#
|
||||
# Unexpected inconsistency when making directory.
|
||||
#
|
||||
# during extraction of ".".
|
||||
#
|
||||
# References: https://savannah.gnu.org/bugs/?65838
|
||||
|
||||
AT_SETUP([extract current dir with --keep-newer-files])
|
||||
AT_KEYWORDS([extract extrac27])
|
||||
AT_TAR_CHECK([
|
||||
mkdir dir
|
||||
touch dir/file
|
||||
tar cf a.tar -C dir .
|
||||
|
||||
mkdir ext
|
||||
tar xv --keep-newer-files -f a.tar -C ext
|
||||
],
|
||||
[0],
|
||||
[./
|
||||
./file
|
||||
])
|
||||
AT_CLEANUP
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -353,6 +353,7 @@ m4_include([extrac23.at])
|
||||
m4_include([extrac24.at])
|
||||
m4_include([extrac25.at])
|
||||
m4_include([extrac26.at])
|
||||
m4_include([extrac27.at])
|
||||
|
||||
m4_include([backup01.at])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user