Skip to content

Commit 6c8ed39

Browse files
committed
fix: "bundle copy --from" fails after "ci-env"
Signed-off-by: Ilya Lesikov <ilya@lesikov.com>
1 parent b2b7d68 commit 6c8ed39

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

cmd/werf/bundle/copy/copy.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,15 @@ func runCopy(ctx context.Context) error {
9696
return err
9797
}
9898

99-
fromAddrRaw := cmdData.From
100-
if fromAddrRaw != "" && cmdData.Repo != "" {
101-
return fmt.Errorf("unable to use --repo=ADDRESS and --from=ADDRESS params at the same time: please specify only --from=ADDRESS param, --repo param has been deprecated")
102-
} else if cmdData.Repo != "" {
99+
var fromAddrRaw string
100+
if cmdData.From == "" && cmdData.Repo == "" {
101+
return fmt.Errorf("--from=ADDRESS param required")
102+
} else if cmdData.From != "" {
103+
fromAddrRaw = cmdData.From
104+
} else {
103105
logboek.Context(ctx).Warn().LogF("Please use --from=ADDRESS param instead of deprecated --repo=ADDRESS param\n")
104106
fromAddrRaw = cmdData.Repo
105107
}
106-
if fromAddrRaw == "" {
107-
return fmt.Errorf("--from=ADDRESS param required")
108-
}
109108

110109
toAddrRaw := cmdData.To
111110
if toAddrRaw == "" {

0 commit comments

Comments
 (0)