As reported in bug 572578, the gentoo rsync repository contains a file
which intentionally has a future timestamp. Since tar future timestamp
warnings are irrelevant, suppress them if tar supports the option.

X-Gentoo-Bug: 572578
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=572578
---
 bin/emerge-webrsync | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 9961ad8..ee0d980 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -66,6 +66,9 @@ fi
 do_verbose=0
 do_debug=0
 keep=false
+tar_opts=()
+
+[[ $(tar --help) == *--warning* ]] && tar_opts+=(--warning=no-timestamp)
 
 if has webrsync-gpg ${FEATURES} ; then
        WEBSYNC_VERIFY_SIGNATURE=1
@@ -86,7 +89,7 @@ do_tar() {
                *.gz)   decompressor="zcat"  ;;
                *)      decompressor="cat"   ;;
        esac
-       ${decompressor} "${file}" | tar "$@"
+       ${decompressor} "${file}" | tar "${tar_opts[@]}" "$@"
        _pipestatus=${PIPESTATUS[*]}
        [[ ${_pipestatus// /} -eq 0 ]]
 }
@@ -225,7 +228,7 @@ sync_local() {
                        return 1
                fi
        else
-               if ! do_tar "${file}" xf -; then
+               if ! do_tar "${file}" -xf -; then
                        eecho "tar failed to extract the image. tarball is 
corrupt? (${file})"
                        rm -fr portage
                        return 1
-- 
2.4.10


Reply via email to