mirrors/dotdrop
1
0
Fork 0
mirror of https://github.com/deadc0de6/dotdrop.git synced 2026-02-15 20:50:05 +00:00
Code Activity

linting

Browse Source
This commit is contained in:
deadc0de6
2022-08-22 21:30:59 +02:00
parent 6067d5ce27
commit 776095fe0a
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dotdrop/cfg_aggregator.py
View File

@@ -8,6 +8,7 @@ handle higher level of the config file
import os import os
import shlex import shlex
import platform import platform
import distro
# local imports # local imports
@@ -338,16 +339,7 @@ class CfgAggregator:
self.variables[self.variable_release] = var_release self.variables[self.variable_release] = var_release
msg = 'enrich variables with {}={}' msg = 'enrich variables with {}={}'
self.log.dbg(msg.format(self.variable_release, var_release)) self.log.dbg(msg.format(self.variable_release, var_release))
if self.variable_distro_id not in self.variables:
has_distro = True
try:
import distro
assert distro
except ImportError as exc:
self.log.dbg('distro packages not found!')
has_distro = False
if has_distro and 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
@@ -355,7 +347,7 @@ class CfgAggregator:
self.variables[self.variable_distro_id] = var_distro_id self.variables[self.variable_distro_id] = var_distro_id
msg = 'enrich variables with {}={}' msg = 'enrich variables with {}={}'
self.log.dbg(msg.format(self.variable_distro_id, var_distro_id)) self.log.dbg(msg.format(self.variable_distro_id, var_distro_id))
if has_distro and 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
@@ -363,7 +355,7 @@ class CfgAggregator:
self.variables[self.variable_distro_version] = var_version self.variables[self.variable_distro_version] = var_version
msg = 'enrich variables with {}={}' msg = 'enrich variables with {}={}'
self.log.dbg(msg.format(self.variable_distro_version, var_version)) self.log.dbg(msg.format(self.variable_distro_version, var_version))
if has_distro and 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