Updated logging for multi-repo setup

This commit is contained in:
Jef Roosens 2022-03-27 18:22:30 +02:00
parent 014ade5092
commit cb2ba86200
Signed by untrusted user: Jef Roosens
GPG key ID: B75D4F293C7052DB
5 changed files with 19 additions and 13 deletions

View file

@ -81,15 +81,16 @@ fn (r &RepoGroupManager) add_pkg_in_repo(repo string, pkg &package.Pkg) ?bool {
arch_repos << r.default_arch
}
for arch in arch_repos {
r.add_pkg_in_arch_repo(repo, arch, pkg) ?
}
}else{
r.add_pkg_in_arch_repo(repo, pkg.info.arch, pkg) ?
}
mut added := false
// TODO properly handle this
return true
for arch in arch_repos {
added = added || r.add_pkg_in_arch_repo(repo, arch, pkg) ?
}
return added
}else{
return r.add_pkg_in_arch_repo(repo, pkg.info.arch, pkg)
}
}
// add_pkg_in_repo adds the given package to the specified repo. A repo is an

View file

@ -86,15 +86,16 @@ fn (mut app App) put_package(repo string) web.Result {
return app.text('Failed to add package.')
}
if !res.added {
os.rm(pkg_path) or { app.lerror("Failed to remove download '$pkg_path': $err.msg") }
app.lwarn("Duplicate package '$res.pkg.full_name()'.")
app.lwarn("Duplicate package '$res.pkg.full_name()' in repo '$repo ($res.pkg.info.arch)'.")
return app.text('File already exists.')
}
app.linfo("Added '$res.pkg.full_name()' to repository.")
app.linfo("Added '$res.pkg.full_name()' to repo '$repo ($res.pkg.info.arch)'.")
return app.text('Package added successfully.')
}