kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-07-03 18:46:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Update repos automatically only if out-of-sync

Browse Source 
Fixes #274
Fixes #212
This commit is contained in:
Ettore Di Giacinto 2021-12-18 16:31:53 +01:00
parent ed63236516
commit 20d01e43c7
2 changed files with 49 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/repo/update.go
View File

@ -1,5 +1,6 @@
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
// Daniele Rondina <geaaru@sabayonlinux.org>
// Copyright © 2021 Ettore Di Giacinto <mudler@mocaccino.org>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@ -24,7 +25,7 @@ import (
)
func NewRepoUpdateCommand() *cobra.Command {
var ans = &cobra.Command{
var repoUpdate = &cobra.Command{
Use: "update [repo1] [repo2] [OPTIONS]",
Short: "Update a specific cached repository or all cached repositories.",
Example: `
@ -72,8 +73,8 @@ $> luet repo update repo1 repo2
},
}
ans.Flags().BoolP("ignore-errors", "i", false, "Ignore errors on sync repositories.")
ans.Flags().BoolP("force", "f", false, "Force resync.")
repoUpdate.Flags().BoolP("ignore-errors", "i", false, "Ignore errors on sync repositories.")
repoUpdate.Flags().BoolP("force", "f", true, "Force resync.")
return ans
return repoUpdate
}

63
pkg/installer/repository.go
View File

@ -856,7 +856,20 @@ func (r *LuetSystemRepository) Sync(ctx *types.Context, force bool) (*LuetSystem
var repoUpdated bool = false
var treefs, metafs string
repobasedir := ctx.Config.GetSystem().GetRepoDatabaseDirPath(r.GetName())
toTimeSync := false
dat, err := ioutil.ReadFile(filepath.Join(repobasedir, "SYNCTIME"))
if err == nil {
parsed, _ := time.Parse(time.RFC3339, string(dat))
if time.Now().After(parsed.Add(24 * time.Hour)) {
toTimeSync = true
ctx.Debug(r.Name, "is old, refresh is suggested")
}
}
ctx.Debug("Sync of the repository", r.Name, "in progress...")
c := r.Client(ctx)
if c == nil {
return nil, errors.New("no client could be generated from repository")
@ -864,20 +877,29 @@ func (r *LuetSystemRepository) Sync(ctx *types.Context, force bool) (*LuetSystem
repositoryReferenceID := r.referenceID()
// Retrieve remote repository.yaml for retrieve revision and date
file, err := c.DownloadFile(repositoryReferenceID)
if err != nil {
return nil, errors.Wrap(err, "while downloading "+repositoryReferenceID)
}
var downloadedRepoMeta *LuetSystemRepository
var file string
repoFile := filepath.Join(repobasedir, repositoryReferenceID)
repobasedir := ctx.Config.GetSystem().GetRepoDatabaseDirPath(r.GetName())
downloadedRepoMeta, err := r.ReadSpecFile(file)
if err != nil {
return nil, err
_, repoExistsErr := os.Stat(repoFile)
if toTimeSync || force || os.IsNotExist(repoExistsErr) {
// Retrieve remote repository.yaml for retrieve revision and date
file, err = c.DownloadFile(repositoryReferenceID)
if err != nil {
return nil, errors.Wrap(err, "while downloading "+repositoryReferenceID)
}
downloadedRepoMeta, err = r.ReadSpecFile(file)
if err != nil {
return nil, err
}
defer os.RemoveAll(file)
} else {
downloadedRepoMeta, err = r.ReadSpecFile(repoFile)
if err != nil {
return nil, err
}
repoUpdated = true
}
// Remove temporary file that contains repository.yaml
// Example: /tmp/HttpClient236052003
defer os.RemoveAll(file)
if r.Cached {
if !force {
@ -968,8 +990,8 @@ func (r *LuetSystemRepository) Sync(ctx *types.Context, force bool) (*LuetSystem
downloadedRepoMeta.GetRevision(),
time.Unix(tsec, 0).String()))
} else {
ctx.Info("Repository", downloadedRepoMeta.GetName(), "is already up to date.")
now := time.Now().Format(time.RFC3339)
ioutil.WriteFile(filepath.Join(repobasedir, "SYNCTIME"), []byte(now), os.ModePerm)
}
meta, err := NewLuetSystemRepositoryMetadata(
@ -993,11 +1015,14 @@ func (r *LuetSystemRepository) Sync(ctx *types.Context, force bool) (*LuetSystem
// e.g. locally we can override the type (disk), or priority
// while remotely it could be advertized differently
r.fill(downloadedRepoMeta)
ctx.Info(
fmt.Sprintf(":information_source: Repository: %s Priority: %d Type: %s",
downloadedRepoMeta.GetName(),
downloadedRepoMeta.GetPriority(),
downloadedRepoMeta.GetType()))
if !repoUpdated {
ctx.Info(
fmt.Sprintf(":information_source: Repository: %s Priority: %d Type: %s",
downloadedRepoMeta.GetName(),
downloadedRepoMeta.GetPriority(),
downloadedRepoMeta.GetType()))
}
return downloadedRepoMeta, nil
}