Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 2dc2a1c

Browse files
committed
Teach brokenImport String()
1 parent 7b2fcae commit 2dc2a1c

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

internal/feedback/feedback.go

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,23 @@ type brokenImport struct {
8888
revision *gps.StringDiff
8989
}
9090

91+
func (bi brokenImport) String() string {
92+
var pr string
93+
var cr string
94+
if bi.revision != nil {
95+
pr = fmt.Sprintf("(%s)", trimSHA(bi.revision.Previous))
96+
cr = fmt.Sprintf("(%s)", trimSHA(bi.revision.Current))
97+
}
98+
99+
return fmt.Sprintf("%v %s for %s. Locking in %v %s",
100+
bi.version.Previous,
101+
pr,
102+
bi.projectPath,
103+
bi.version.Current,
104+
cr,
105+
)
106+
}
107+
91108
// ConstraintFeedback holds project constraint feedback data
92109
type BrokenImportFeedback struct {
93110
brokenImports []brokenImport
@@ -108,13 +125,7 @@ func NewBrokenImportFeedback(ld *gps.LockDiff) *BrokenImportFeedback {
108125

109126
func (b BrokenImportFeedback) LogFeedback(logger *log.Logger) {
110127
for _, bi := range b.brokenImports {
111-
logger.Printf("Warning: Unable to preserve imported lock %v (%v) for %v. Locking in %v (%v)\n",
112-
bi.version.Previous,
113-
trimSHA(bi.revision.Previous),
114-
bi.projectPath,
115-
bi.version.Current,
116-
trimSHA(bi.revision.Current),
117-
)
128+
logger.Printf("Warning: Unable to preserve imported lock %v\n", bi)
118129
}
119130
}
120131

0 commit comments

Comments
 (0)