some more cosmetic changes

- fix an intend
- add TODO: remove pkg
- add .before_bott_at to backup of seastatus.tcl
This commit is contained in:
2024-06-27 15:37:59 +02:00
parent 95a3ff4ffd
commit 8b13e32ed7
3 changed files with 5 additions and 7 deletions

View File

@ -138,9 +138,9 @@ class FrappyManager(ServiceManager):
start_dir, env = super().prepare_start(ins, service)
env_update = {}
for key, value in env.items():
if '<SERV>' in value:
env_update[key] = value.replace('<SERV>', service)
os.environ[key] = env[key]
if '<SERV>' in value:
env_update[key] = value.replace('<SERV>', service)
os.environ[key] = env[key]
cfgpaths = self.config_dirs(ins, service)
if cfgpaths:
env_update['FRAPPY_CONFDIR'] = os.pathsep.join(cfgpaths)
@ -404,7 +404,6 @@ class FrappyManager(ServiceManager):
if proposed_addons: # and set(proposed_addons) != set(running_addons):
proposed_cfg['addons'] = {','.join(proposed_addons)}
self._debug = {}
for service in FrappyManager.services:
given = givencfgs.get(service)
running = self.frappy_cfgs.get(service)
@ -413,8 +412,6 @@ class FrappyManager(ServiceManager):
if running:
self.state[f'frappy {service}'] = running
self._debug[service] = (seaconfig, available, running, running in self.frappy2sea)
if seaconfig and (available or running in self.frappy2sea):
# we get here when the sea server is running and either at least one of:
# - the sea config is matching any frappy cfg