From 78a38cc78f59eaa7653476f23554d0cf05d5c9be Mon Sep 17 00:00:00 2001 From: Gorbunov Kirill Andreevich Date: Tue, 2 Apr 2024 23:11:26 +0300 Subject: [PATCH] #8 skip update is branch exist. --- cmd/pkgdashcli/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/pkgdashcli/main.go b/cmd/pkgdashcli/main.go index 66dde15..dae46f9 100644 --- a/cmd/pkgdashcli/main.go +++ b/cmd/pkgdashcli/main.go @@ -259,6 +259,10 @@ func Execute(ctx context.Context, gitSource source.SourceControl, mvs map[string logger.Debugf(ctx, fmt.Sprintf("Start update %s from %s to %s", path, mod.Module.Version, mod.Version)) err := gitSource.RequestOpen(ctx, branch, path, mod) if err != nil { + if strings.Contains(err.Error(), "already exists") { + logger.Debugf(ctx, fmt.Sprintf("skip %s, branch already exists"), path) + continue + } logger.Fatal(ctx, fmt.Sprintf("failed to create pr: %v", err)) } logger.Debugf(ctx, fmt.Sprintf("Update successful for %s", path)) @@ -271,9 +275,6 @@ func Execute(ctx context.Context, gitSource source.SourceControl, mvs map[string logger.Debugf(ctx, fmt.Sprintf("Start close for %s", path)) for _, branch := range cfg.Branches { if err := gitSource.RequestClose(ctx, branch, path); err != nil { - if strings.Contains(err.Error(), "already exists") { - continue - } logger.Fatal(ctx, fmt.Sprintf("failed to close pr: %v", err)) } }