mirror of
https://github.com/Jguer/yay.git
synced 2025-12-27 07:35:48 -05:00
8916cd174b
* rework relationship between runtime and cfg * separate runtime from cfg * simplify instantiation logic * move installer to appropriate package * move operator to sync package * add tests for srcinfo service * consolidate srcinfo service in sync * add logger to srcinfo * add logger to preparer * remove unused text functions * remove remaining text.* from srcinfo * remove global logger parts * remove global org method exports * remove global logger * move text->input * add rule to prevent fmt.Print * update golangci go version * remove outdated FAQs * remove outdated FAQs
40 lines
865 B
Go
40 lines
865 B
Go
package workdir
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"github.com/leonelquinteros/gotext"
|
|
|
|
"github.com/Jguer/yay/v12/pkg/settings/exe"
|
|
)
|
|
|
|
func gitMerge(ctx context.Context, cmdBuilder exe.ICmdBuilder, dir string) error {
|
|
_, stderr, err := cmdBuilder.Capture(
|
|
cmdBuilder.BuildGitCmd(ctx,
|
|
dir, "reset", "--hard", "HEAD"))
|
|
if err != nil {
|
|
return errors.New(gotext.Get("error resetting %s: %s", dir, stderr))
|
|
}
|
|
|
|
_, stderr, err = cmdBuilder.Capture(
|
|
cmdBuilder.BuildGitCmd(ctx,
|
|
dir, "merge", "--no-edit", "--ff"))
|
|
if err != nil {
|
|
return errors.New(gotext.Get("error merging %s: %s", dir, stderr))
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func mergePkgbuilds(ctx context.Context, cmdBuilder exe.ICmdBuilder, pkgbuildDirs map[string]string) error {
|
|
for _, dir := range pkgbuildDirs {
|
|
err := gitMerge(ctx, cmdBuilder, dir)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|