| Index: deploytool/cmd/luci_deploy/checkout.go
|
| diff --git a/deploytool/cmd/checkout.go b/deploytool/cmd/luci_deploy/checkout.go
|
| similarity index 99%
|
| rename from deploytool/cmd/checkout.go
|
| rename to deploytool/cmd/luci_deploy/checkout.go
|
| index 03fa10e2dec5ded1a56ba2eb6d62c311ab0b8eb9..462a7aeeea2292c17eba6b7586f8afe0d28d7a96 100644
|
| --- a/deploytool/cmd/checkout.go
|
| +++ b/deploytool/cmd/luci_deploy/checkout.go
|
| @@ -27,7 +27,7 @@ import (
|
| // deployToolCfg is the name of the source-root deployment configuration file.
|
| const (
|
| // deployToolCfg is the name of the source-root deploytool configuration file.
|
| - deployToolCfg = ".luci-deploytool.cfg"
|
| + deployToolCfg = "luci-deploy.cfg"
|
|
|
| // checkoutsSubdir is the name of the checkouts directory underneath the
|
| // working directory.
|
| @@ -145,7 +145,11 @@ func checkout(w *work, l *deployLayout, applyOverrides bool) error {
|
| if override, ok := l.userSourceOverrides[sc.overrideURL]; ok {
|
| log.Infof(w, "Applying user repository override: [%+v] => [%+v]", sc.Source, override)
|
|
|
| + // Any local overrides cause the source group to be considered
|
| + // tainted.
|
| sc.FrozenLayout_Source.Source = override
|
| + sc.FrozenLayout_Source.Source.Tainted = true
|
| +
|
| if err := sc.addRegistryRepos(®); err != nil {
|
| return errors.Annotate(err).Reason("failed to add (overridden) [%(sourceCheckout)s] to registry").
|
| D("sourceCheckout", sc).Err()
|
|
|