1 |
commit: 26c8526293bd93906390d8fc830dc55052fc4d40 |
2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 20 23:41:24 2019 +0000 |
4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Aug 20 23:42:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=26c85262 |
7 |
|
8 |
doebuild_environment: add newline to PORTAGE_COMPRESSION_COMMAND messages |
9 |
|
10 |
Fixes: cff2c0149142 ("Support different compressors for binary packages") |
11 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
12 |
|
13 |
lib/portage/package/ebuild/doebuild.py | 6 +++--- |
14 |
1 file changed, 3 insertions(+), 3 deletions(-) |
15 |
|
16 |
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py |
17 |
index 6f980f87d..584ff798b 100644 |
18 |
--- a/lib/portage/package/ebuild/doebuild.py |
19 |
+++ b/lib/portage/package/ebuild/doebuild.py |
20 |
@@ -543,7 +543,7 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, |
21 |
compression = _compressors[binpkg_compression] |
22 |
except KeyError as e: |
23 |
if binpkg_compression: |
24 |
- writemsg("Warning: Invalid or unsupported compression method: %s" % e.args[0]) |
25 |
+ writemsg("Warning: Invalid or unsupported compression method: %s\n" % e.args[0]) |
26 |
else: |
27 |
# Empty BINPKG_COMPRESS disables compression. |
28 |
mysettings['PORTAGE_COMPRESSION_COMMAND'] = 'cat' |
29 |
@@ -551,11 +551,11 @@ def doebuild_environment(myebuild, mydo, myroot=None, settings=None, |
30 |
try: |
31 |
compression_binary = shlex_split(varexpand(compression["compress"], mydict=settings))[0] |
32 |
except IndexError as e: |
33 |
- writemsg("Warning: Invalid or unsupported compression method: %s" % e.args[0]) |
34 |
+ writemsg("Warning: Invalid or unsupported compression method: %s\n" % e.args[0]) |
35 |
else: |
36 |
if find_binary(compression_binary) is None: |
37 |
missing_package = compression["package"] |
38 |
- writemsg("Warning: File compression unsupported %s. Missing package: %s" % (binpkg_compression, missing_package)) |
39 |
+ writemsg("Warning: File compression unsupported %s. Missing package: %s\n" % (binpkg_compression, missing_package)) |
40 |
else: |
41 |
cmd = [varexpand(x, mydict=settings) for x in shlex_split(compression["compress"])] |
42 |
# Filter empty elements |