@@ -1447,11 +1447,11 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
1447
1447
releaseAttachments = append (releaseAttachments , attachments [i ].RelativePath ())
1448
1448
}
1449
1449
1450
- if _ , err = sess .Exec ("UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)" , repo .ID ); err != nil {
1450
+ if _ , err : = sess .Exec ("UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)" , repo .ID ); err != nil {
1451
1451
return err
1452
1452
}
1453
1453
1454
- if err = deleteBeans (sess ,
1454
+ if err : = deleteBeans (sess ,
1455
1455
& Access {RepoID : repo .ID },
1456
1456
& Action {RepoID : repo .ID },
1457
1457
& Watch {RepoID : repoID },
@@ -1475,28 +1475,33 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
1475
1475
return fmt .Errorf ("deleteBeans: %v" , err )
1476
1476
}
1477
1477
1478
+ // Delete Labels and related objects
1479
+ if err := deleteLabelsByRepoID (sess , repoID ); err != nil {
1480
+ return err
1481
+ }
1482
+
1478
1483
// Delete Issues and related objects
1479
1484
var attachmentPaths []string
1480
1485
if attachmentPaths , err = deleteIssuesByRepoID (sess , repoID ); err != nil {
1481
1486
return err
1482
1487
}
1483
1488
1484
- if _ , err = sess .Where ("repo_id = ?" , repoID ).Delete (new (RepoUnit )); err != nil {
1489
+ if _ , err : = sess .Where ("repo_id = ?" , repoID ).Delete (new (RepoUnit )); err != nil {
1485
1490
return err
1486
1491
}
1487
1492
1488
1493
if repo .IsFork {
1489
- if _ , err = sess .Exec ("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?" , repo .ForkID ); err != nil {
1494
+ if _ , err : = sess .Exec ("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?" , repo .ForkID ); err != nil {
1490
1495
return fmt .Errorf ("decrease fork count: %v" , err )
1491
1496
}
1492
1497
}
1493
1498
1494
- if _ , err = sess .Exec ("UPDATE `user` SET num_repos=num_repos-1 WHERE id=?" , uid ); err != nil {
1499
+ if _ , err : = sess .Exec ("UPDATE `user` SET num_repos=num_repos-1 WHERE id=?" , uid ); err != nil {
1495
1500
return err
1496
1501
}
1497
1502
1498
1503
if len (repo .Topics ) > 0 {
1499
- if err = removeTopicsFromRepo (sess , repo .ID ); err != nil {
1504
+ if err : = removeTopicsFromRepo (sess , repo .ID ); err != nil {
1500
1505
return err
1501
1506
}
1502
1507
}
0 commit comments