From 0060bf8878eb41b87b5fdd52fd685766c12abafd Mon Sep 17 00:00:00 2001 From: ldericher Date: Wed, 19 Aug 2020 12:02:46 +0200 Subject: [PATCH] marker --- example/kiwi.yml | 2 +- src/etc/kiwi_default.yml | 2 +- src/kiwi/subcommands/init.py | 2 +- src/kiwi/subcommands/utils/project.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/example/kiwi.yml b/example/kiwi.yml index 5957503..d8dab05 100644 --- a/example/kiwi.yml +++ b/example/kiwi.yml @@ -12,7 +12,7 @@ runtime: markers: project: .project - down: .down + disabled: .disabled network: name: kiwi_hub diff --git a/src/etc/kiwi_default.yml b/src/etc/kiwi_default.yml index 8f477ee..1404379 100644 --- a/src/etc/kiwi_default.yml +++ b/src/etc/kiwi_default.yml @@ -6,7 +6,7 @@ runtime: env: null markers: project: .project - down: .down + disabled: .disabled network: name: kiwi_hub cidr: 10.22.46.0/24 diff --git a/src/kiwi/subcommands/init.py b/src/kiwi/subcommands/init.py index 1f3714b..a637c79 100644 --- a/src/kiwi/subcommands/init.py +++ b/src/kiwi/subcommands/init.py @@ -58,7 +58,7 @@ class InitCommand(SubCommand): # markers user_input(config, 'markers:project', "Enter marker string for project directories") - user_input(config, 'markers:down', "Enter marker string for disabled projects") + user_input(config, 'markers:disabled', "Enter marker string for disabled projects") # network user_input(config, 'network:name', "Enter name for local docker network") diff --git a/src/kiwi/subcommands/utils/project.py b/src/kiwi/subcommands/utils/project.py index 7551de2..b248abe 100644 --- a/src/kiwi/subcommands/utils/project.py +++ b/src/kiwi/subcommands/utils/project.py @@ -26,7 +26,7 @@ class Project: return f"{self.__name}{LoadedConfig.get()['markers:project']}" def disabled_dir_name(self): - return f"{self.enabled_dir_name()}{LoadedConfig.get()['markers:down']}" + return f"{self.enabled_dir_name()}{LoadedConfig.get()['markers:disabled']}" def conf_dir_name(self): return os.path.join(self.dir_name(), CONF_DIRECTORY_NAME) @@ -81,7 +81,7 @@ class Project: def _extract_project_name(file_name): config = LoadedConfig.get() enabled_suffix = config['markers:project'] - disabled_suffix = f"{enabled_suffix}{config['markers:down']}" + disabled_suffix = f"{enabled_suffix}{config['markers:disabled']}" if os.path.isdir(file_name): # all subdirectories