gps: Supervise git cleanup, use new ct constant

golang · Oct 17, 2017 · d596e65 · d596e65
1 parent d3d9967
commit d596e65
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/internal/gps/maybe_source.go b/internal/gps/maybe_source.go
@@ -105,9 +105,11 @@ func (m maybeGitSource) try(ctx context.Context, cachedir string, c singleSource
 	if r.CheckLocal() {
 		state |= sourceExistsLocally
 
-		// If repository already exists on disk, make a pass to be sure
-		// everything's clean.
-		if err = src.cleanup(ctx); err != nil {
+		if err := superv.do(ctx, "git", ctValidateLocal, func(ctx context.Context) error {
+			// If repository already exists on disk, make a pass to be sure
+			// everything's clean.
+			return src.cleanup(ctx)
+		}); err != nil {
 			return nil, 0, err
 		}
 	}

diff --git a/internal/gps/source_manager.go b/internal/gps/source_manager.go
@@ -739,6 +739,7 @@ const (
 	ctSourceInit
 	ctSourceFetch
 	ctExportTree
+	ctValidateLocal
 )
 
 func (ct callType) String() string {