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

Commit c7c3fd8

Browse files
committed
gps: fix a bug that kept empty dirs after pruning
Signed-off-by: Ibrahim AshShohail <[email protected]>
1 parent b4fca9b commit c7c3fd8

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

gps/prune.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func pruneGoTestFiles(fsState filesystemState) error {
302302
}
303303

304304
func deleteEmptyDirs(fsState filesystemState) error {
305-
toDelete := make(sort.StringSlice, 0)
305+
sort.Sort(sort.Reverse(sort.StringSlice(fsState.dirs)))
306306

307307
for _, dir := range fsState.dirs {
308308
path := filepath.Join(fsState.root, dir)
@@ -313,14 +313,9 @@ func deleteEmptyDirs(fsState filesystemState) error {
313313
}
314314

315315
if !notEmpty {
316-
toDelete = append(toDelete, path)
317-
}
318-
}
319-
320-
sort.Sort(sort.Reverse(sort.StringSlice(toDelete)))
321-
for _, path := range toDelete {
322-
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
323-
return err
316+
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
317+
return err
318+
}
324319
}
325320
}
326321

0 commit comments

Comments
 (0)