Attachment 701256 Details for Bug 914733 – Warn only when this issue occurs.

[patch] Warn only when this issue occurs.

proposal.patch (text/plain), 1.94 KB, created by Pavel Raiskup on 2013-02-22 16:31:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pavel Raiskup

Created: 2013-02-22 16:31:47 UTC

Size: 1.94 KB

patch

obsolete

>diff --git a/acinclude.m4 b/acinclude.m4
>index d48c881..8620760 100644
>--- a/acinclude.m4
>+++ b/acinclude.m4
>@@ -52,3 +52,22 @@ AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H],
>     )
>   fi
> ])
>+
>+# Allow maintainer to disable compress's exit-2-value hack
>+AC_DEFUN([TAR_COMPRESS_EXIT_HACK],[
>+  AC_ARG_WITH(
>+      [compress-exit-hack],
>+      AS_HELP_STRING(
>+          [--without-compress-exit-hack],
>+          [fail when -Z (compress) compressor exists with non-error value 2]),
>+      [with_compress_exit_hack=no]
>+  )
>+  if test "x$with_compress_exit_hack" != xno; then
>+      AC_DEFINE_UNQUOTED(
>+          HAVE_COMPRESS_EXIT_HACK,
>+          "$tar_cv_compressor_compress",
>+          define to name of compress utility when we don't want to fail hardly
>+          if this utility exits with exit code 2.  It should just mean that the
>+          compressed file is bigger than original file)
>+  fi
>+])
>diff --git a/configure.ac b/configure.ac
>index 3303c53..b0a4f14 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -253,6 +253,9 @@ TAR_COMPR_PROGRAM(lzma)
> TAR_COMPR_PROGRAM(lzop)
> TAR_COMPR_PROGRAM(xz)
> 
>+# must be called after TAR_COMPR_PROGRAM(compress) call
>+TAR_COMPRESS_EXIT_HACK
>+
> AC_MSG_CHECKING(for default archive format)
> 
> AC_ARG_VAR([DEFAULT_ARCHIVE_FORMAT],
>diff --git a/src/system.c b/src/system.c
>index e1fd263..454d01e 100644
>--- a/src/system.c
>+++ b/src/system.c
>@@ -189,6 +189,13 @@ sys_wait_for_child (pid_t child_pid, bool eof)
> 	  if (!(!eof && sig == SIGPIPE))
> 	    FATAL_ERROR ((0, 0, _("Child died with signal %d"), sig));
> 	}
>+#ifdef HAVE_COMPRESS_EXIT_HACK
>+      if (!strcmp (use_compress_program_option, HAVE_COMPRESS_EXIT_HACK)
>+	  && WEXITSTATUS (wait_status) == 2)
>+        WARN ((0, 0, _("%lu: Child says that compressed output is bigger "
>+		       "then original data."),
>+	       (unsigned long) child_pid));
>+#endif
>       else if (WEXITSTATUS (wait_status) != 0)
> 	FATAL_ERROR ((0, 0, _("Child returned status %d"),
> 		      WEXITSTATUS (wait_status)));

Actions: View | Diff

Attachments on bug 914733: 701256