SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

config: Make common repository check a bit more Pythonic

Browse Source 
Shortens code and makes the intent clearer.

Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Chris Laplante 2020-07-27 16:18:57 +02:00 committed by Jan Kiszka
parent 0e7c32cc79
commit 22f7c0b03d
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kas/config.py
View File

@ -39,19 +39,16 @@ class Config:
self._override_target = target
self._override_task = task
self._config = {}
self.filenames = []
self.filenames = [os.path.abspath(configfile)
for configfile in filename.split(':')]
for configfile in filename.split(':'):
configfile = os.path.abspath(configfile)
repo_path = Repo.get_root_path(os.path.dirname(configfile),
fallback=False)
if self.filenames == []:
common_path = repo_path
elif repo_path != common_path:
raise IncludeException('All concatenated config files must '
'belong to the same repository or all '
'must be outside of versioning control')
self.filenames.append(configfile)
repo_paths = [Repo.get_root_path(os.path.dirname(configfile),
fallback=False)
for configfile in self.filenames]
if len(set(repo_paths)) > 1:
raise IncludeException('All concatenated config files must '
'belong to the same repository or all '
'must be outside of versioning control')
self.handler = IncludeHandler(self.filenames)
self.repo_dict = self._get_repo_dict()