| 1 |
commit: 483385348b32fab2230f596816b6e1d0b6489962 |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 24 21:26:58 2021 +0000 |
| 4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 24 21:26:58 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=48338534 |
| 7 |
|
| 8 |
Add option to generate BSD-style tagged hashes (can be verified by modern coreutils) |
| 9 |
|
| 10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
| 11 |
|
| 12 |
catalyst/base/genbase.py | 6 +++++- |
| 13 |
catalyst/defaults.py | 2 ++ |
| 14 |
2 files changed, 7 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/catalyst/base/genbase.py b/catalyst/base/genbase.py |
| 17 |
index c7dd87bc..52418877 100644 |
| 18 |
--- a/catalyst/base/genbase.py |
| 19 |
+++ b/catalyst/base/genbase.py |
| 20 |
@@ -24,7 +24,11 @@ class GenBase(): |
| 21 |
h.update(data) |
| 22 |
|
| 23 |
filename = os.path.split(filepath)[1] |
| 24 |
- return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n' |
| 25 |
+ |
| 26 |
+ if self.settings['digest_format'] == 'bsd': |
| 27 |
+ return f'# {name.upper()} HASH\n{name.upper()} ({filename}) = {h.hexdigest()}\n' |
| 28 |
+ else: |
| 29 |
+ return f'# {name.upper()} HASH\n{h.hexdigest()} {filename}\n' |
| 30 |
|
| 31 |
def gen_contents_file(self, path): |
| 32 |
c = self.settings['contents_map'] |
| 33 |
|
| 34 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
| 35 |
index ccb0a584..2cede562 100644 |
| 36 |
--- a/catalyst/defaults.py |
| 37 |
+++ b/catalyst/defaults.py |
| 38 |
@@ -11,6 +11,7 @@ from DeComp.definitions import DECOMPRESSOR_PROGRAM_OPTIONS, LIST_XATTRS_OPTIONS |
| 39 |
valid_config_file_values = frozenset([ |
| 40 |
"compression_mode", |
| 41 |
"digests", |
| 42 |
+ "digest_format", |
| 43 |
"distcc_hosts", |
| 44 |
"distdir", |
| 45 |
"envscript", |
| 46 |
@@ -35,6 +36,7 @@ confdefaults = { |
| 47 |
"compressor_options": XATTRS_OPTIONS['linux'], |
| 48 |
"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS['linux'], |
| 49 |
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, |
| 50 |
+ "digest_format": 'linux', |
| 51 |
"distdir": portage.settings['DISTDIR'], |
| 52 |
"icecream": "/var/cache/icecream", |
| 53 |
'list_xattrs_opt': LIST_XATTRS_OPTIONS['linux'], |
Archives