Skip to content

Commit db7ac8b

Browse files
committed
use notice instead of suspend delete archives
1 parent c6ce6bd commit db7ac8b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

models/repo.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ func DeleteRepository(uid, repoID int64) error {
11251125
desc := fmt.Sprintf("delete repository files[%s]: %v", repoPath, err)
11261126
log.Warn(desc)
11271127
if err = CreateRepositoryNotice(desc); err != nil {
1128-
log.Error(4, "add notice: %v", err)
1128+
log.Error(4, "CreateRepositoryNotice: %v", err)
11291129
}
11301130
}
11311131

@@ -1268,10 +1268,14 @@ func DeleteRepositoryArchives() error {
12681268
return x.Where("id > 0").Iterate(new(Repository),
12691269
func(idx int, bean interface{}) error {
12701270
repo := bean.(*Repository)
1271-
if err := repo.GetOwner(); err != nil {
1272-
return err
1271+
repoPath, err := repo.RepoPath()
1272+
if err != nil {
1273+
if err2 := CreateRepositoryNotice(fmt.Sprintf("DeleteRepositoryArchives[%d]: %v", repo.ID, err)); err2 != nil {
1274+
log.Error(4, "CreateRepositoryNotice: %v", err2)
1275+
}
1276+
return nil
12731277
}
1274-
return os.RemoveAll(filepath.Join(RepoPath(repo.Owner.Name, repo.Name), "archives"))
1278+
return os.RemoveAll(filepath.Join(repoPath, "archives"))
12751279
})
12761280
}
12771281

0 commit comments

Comments
 (0)