chore: stop shadowing import names with variables

This commit is contained in:
Jef Roosens 2023-02-15 16:24:07 +01:00
parent bff817ccd9
commit 4dc82515f4
8 changed files with 52 additions and 57 deletions

View file

@ -25,9 +25,9 @@ pub fn cmd() cli.Command {
description: 'Start the Vieter server.'
execute: fn (cmd cli.Command) ! {
config_file := cmd.flags.get_string('config-file')!
conf := vconf.load[Config](prefix: 'VIETER_', default_path: config_file)!
conf_ := vconf.load[Config](prefix: 'VIETER_', default_path: config_file)!
server(conf)!
server(conf_)!
}
}
}

View file

@ -82,7 +82,7 @@ pub fn server(conf Config) ! {
repo_dir := os.join_path_single(conf.data_dir, server.repo_dir_name)
// This also creates the directories if needed
repo := repo.new(repo_dir, conf.pkg_dir, conf.default_arch) or {
repo_ := repo.new(repo_dir, conf.pkg_dir, conf.default_arch) or {
logger.error(err.msg())
exit(1)
}
@ -105,7 +105,7 @@ pub fn server(conf Config) ! {
logger: logger
api_key: conf.api_key
conf: conf
repo: repo
repo: repo_
db: db
collector: collector
job_queue: build.new_job_queue(global_ce, conf.base_image)