[gentoo-commits] proj/portage:master commit in: /, bin/

[Mike Gilbert]

commit:     0275734583c28a5a9e9e5c07a2724269efe5d1a5
Author:     Philipp Rösner <philipp.roesner <AT> student <DOT> uni-halle <DOT> de>
AuthorDate: Fri Aug 19 15:46:03 2022 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Aug 19 17:31:17 2022 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=02757345

bin/ecompress: add lz4 command line options

Calling lz4 with mutliple files results in warnings of the form:

`Warning : <path>/<file> won't be used !
Do you want multiple input files (-m) ?`

Adding the `-m` option to the lz4 call resolves this issue.
Additionally, the `--rm` option will remove the source files after a
successful compression.

Bug: https://bugs.gentoo.org/672916
Closes: https://github.com/gentoo/portage/pull/892
Signed-off-by: Philipp Rösner <rndxelement <AT> protonmail.com>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 NEWS          | 3 +++
 bin/ecompress | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 6245c9e09..87799bc4f 100644
--- a/NEWS
+++ b/NEWS
@@ -75,6 +75,9 @@ Bug fixes:
 * emerge(1): mention --with-bdeps=n behavior for both --usepkg (-k) and
   --usepkgonly (-K) (bug #863422).
 
+* ecompress: add option to lz4 in order to be able to compress multiple
+  files at once (bug #672916).
+
 portage-3.0.34 (2022-07-20)
 --------------
 

diff --git a/bin/ecompress b/bin/ecompress
index 0aa5091dd..c69e8d6dd 100755
--- a/bin/ecompress
+++ b/bin/ecompress
@@ -124,6 +124,10 @@ fi
 if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
 	case ${PORTAGE_COMPRESS} in
 		bzip2|gzip)  PORTAGE_COMPRESS_FLAGS="-9";;
+		# Without setting '-m' lz4 will not compress multiple files at once.
+		# See: https://bugs.gentoo.org/672916
+		# Setting '--rm' will remove the source files after a successful compression.
+		lz4)  PORTAGE_COMPRESS_FLAGS="-m --rm";;
 	esac
 fi