1
0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-11 06:09:17 +00:00
This commit is contained in:
deadc0de6
2022-09-03 09:07:28 +02:00
parent c641116f77
commit 53edfa9694

View File

@@ -330,39 +330,43 @@ class CfgAggregator:
# https://docs.python.org/3/library/platform.html#platform.system # https://docs.python.org/3/library/platform.html#platform.system
var_os = platform.system().lower() var_os = platform.system().lower()
self.variables[self.variable_os] = var_os self.variables[self.variable_os] = var_os
msg = 'enrich variables with {}={}' msg = f'enrich variables with {self.variable_os}={var_os}'
self.log.dbg(msg.format(self.variable_os, var_os)) self.log.dbg(msg)
if self.variable_release not in self.variables: if self.variable_release not in self.variables:
# enrich with release variable # enrich with release variable
# https://docs.python.org/3/library/platform.html#platform.release # https://docs.python.org/3/library/platform.html#platform.release
var_release = platform.release().lower() var_release = platform.release().lower()
self.variables[self.variable_release] = var_release self.variables[self.variable_release] = var_release
msg = 'enrich variables with {}={}' msg = f'enrich variables with {self.variable_release}'
self.log.dbg(msg.format(self.variable_release, var_release)) msg += f'={var_release}'
self.log.dbg(msg)
if self.variable_distro_id not in self.variables: if self.variable_distro_id not in self.variables:
# enrich with distro variable # enrich with distro variable
# https://pypi.org/project/distro/ # https://pypi.org/project/distro/
# https://distro.readthedocs.io/en/latest/#distro.id # https://distro.readthedocs.io/en/latest/#distro.id
var_distro_id = distro.id().lower() var_distro_id = distro.id().lower()
self.variables[self.variable_distro_id] = var_distro_id self.variables[self.variable_distro_id] = var_distro_id
msg = 'enrich variables with {}={}' msg = f'enrich variables with {self.variable_distro_id}'
self.log.dbg(msg.format(self.variable_distro_id, var_distro_id)) msg += f'={var_distro_id}'
self.log.dbg(msg)
if self.variable_distro_version not in self.variables: if self.variable_distro_version not in self.variables:
# enrich with distro variable # enrich with distro variable
# https://pypi.org/project/distro/ # https://pypi.org/project/distro/
# https://distro.readthedocs.io/en/latest/#distro.version # https://distro.readthedocs.io/en/latest/#distro.version
var_version = distro.version().lower() var_version = distro.version().lower()
self.variables[self.variable_distro_version] = var_version self.variables[self.variable_distro_version] = var_version
msg = 'enrich variables with {}={}' msg = f'enrich variables with {self.variable_distro_version}'
self.log.dbg(msg.format(self.variable_distro_version, var_version)) msg += f'={var_version}'
self.log.dbg(msg)
if self.variable_distro_like not in self.variables: if self.variable_distro_like not in self.variables:
# enrich with distro variable # enrich with distro variable
# https://pypi.org/project/distro/ # https://pypi.org/project/distro/
# https://distro.readthedocs.io/en/latest/#distro.like # https://distro.readthedocs.io/en/latest/#distro.like
var_like = distro.like().lower() var_like = distro.like().lower()
self.variables[self.variable_distro_like] = var_like self.variables[self.variable_distro_like] = var_like
msg = 'enrich variables with {}={}' msg = f'enrich variables with {self.variable_distro_like}'
self.log.dbg(msg.format(self.variable_distro_like, var_like)) msg += f'={var_like}'
self.log.dbg(msg)
def _patch_keys_to_objs(self, containers, keys, get_by_key, islist=True): def _patch_keys_to_objs(self, containers, keys, get_by_key, islist=True):
""" """