From 6118cb932a08c046c256bea97cf782c228ae3257 Mon Sep 17 00:00:00 2001
From: ldericher <jmmiehe@gmx.de>
Date: Thu, 20 Aug 2020 15:36:28 +0200
Subject: [PATCH] format; kwargs fix

---
 src/kiwi/executable.py | 29 ++++++-----------------------
 src/kiwi/project.py    |  4 ++++
 src/kiwi/runner.py     |  7 +++----
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/src/kiwi/executable.py b/src/kiwi/executable.py
index 9f8aa8d..3d79983 100644
--- a/src/kiwi/executable.py
+++ b/src/kiwi/executable.py
@@ -7,22 +7,6 @@ import subprocess
 from .config import LoadedConfig
 
 
-def _update_kwargs(**kwargs):
-    config = LoadedConfig.get()
-
-    # ensure there is an environment
-    if 'env' not in kwargs:
-        kwargs['env'] = {}
-
-    # add common environment from config
-    if config['runtime:env'] is not None:
-        kwargs['env'].update(config['runtime:env'])
-
-    logging.debug(f"kwargs updated: {kwargs}")
-
-    return kwargs
-
-
 def _is_executable(filename):
     if filename is None:
         return False
@@ -46,7 +30,7 @@ class Executable:
         def __init__(self, exe_name):
             self.__exe_path = _find_exe_file(exe_name)
 
-        def __build_cmd(self, args, **kwargs):
+        def __build_cmd(self, args, kwargs):
             cmd = [self.__exe_path, *args]
 
             logging.debug(f"Executable cmd{cmd}, kwargs{kwargs}")
@@ -54,13 +38,13 @@ class Executable:
 
         def run(self, process_args, **kwargs):
             return subprocess.run(
-                self.__build_cmd(process_args, **_update_kwargs(**kwargs)),
+                self.__build_cmd(process_args, kwargs),
                 **kwargs
             )
 
         def Popen(self, process_args, **kwargs):
             return subprocess.Popen(
-                self.__build_cmd(process_args, **_update_kwargs(**kwargs)),
+                self.__build_cmd(process_args, kwargs),
                 **kwargs
             )
 
@@ -73,10 +57,9 @@ class Executable:
                 **kwargs
             )
 
-            less_process = Executable('less').run(
-                ['-R', '+G'],
-                stdin=process.stdout
-            )
+            less_process = Executable('less').run([
+                '-R', '+G'
+            ], stdin=process.stdout)
 
             process.communicate()
             return less_process
diff --git a/src/kiwi/project.py b/src/kiwi/project.py
index 8b59149..5072aa8 100644
--- a/src/kiwi/project.py
+++ b/src/kiwi/project.py
@@ -88,6 +88,10 @@ class Project:
             'TARGETDIR': self.target_dir_name()
         })
 
+        # add common environment from config
+        if config['runtime:env'] is not None:
+            kwargs['env'].update(config['runtime:env'])
+
         logging.debug(f"kwargs updated: {kwargs}")
 
         return True
diff --git a/src/kiwi/runner.py b/src/kiwi/runner.py
index 9f4058d..affa16e 100644
--- a/src/kiwi/runner.py
+++ b/src/kiwi/runner.py
@@ -19,10 +19,9 @@ class Runner:
         def __init__(self):
             # probe for Docker access
             try:
-                Executable('docker').run(
-                    ['ps'],
-                    check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
-                )
+                Executable('docker').run([
+                    'ps'
+                ], check=True, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
 
             except subprocess.CalledProcessError:
                 raise PermissionError("Cannot access docker, please get into the docker group or run as root!")