Skip to content

Commit

Permalink
fix: update repo after package deletion
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Mar 10, 2024
1 parent 50e0043 commit 7ced85c
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions server/repos.go
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ func (router *reposRouter) deleteRPM(w http.ResponseWriter, r *http.Request) {
return
}

rpm, err := re.QueryRpms().Where(rpmpackage.IDEQ(rpmID)).First(r.Context())
rpmPackage, err := re.QueryRpms().Where(rpmpackage.IDEQ(rpmID)).First(r.Context())

if ent.IsNotFound(err) {
render.Render(w, r, types.ErrNotFound(errors.New("rpm not found")))
Expand All @@ -512,13 +512,18 @@ func (router *reposRouter) deleteRPM(w http.ResponseWriter, r *http.Request) {
panic(err)
}

if err := router.database.RpmPackage.DeleteOne(rpm).Exec(r.Context()); err != nil {
if err := router.database.RpmPackage.DeleteOne(rpmPackage).Exec(r.Context()); err != nil {
panic(err)
}

targetDirectory := path.Join(router.environment.StorageDirectory, id, rpm.FilePath)
targetDirectory := path.Join(router.environment.StorageDirectory, id)
rpmPath := path.Join(targetDirectory, rpmPackage.FilePath)

if err := os.Remove(targetDirectory); err != nil && !os.IsNotExist(err) {
if err := os.Remove(rpmPath); err != nil && !os.IsNotExist(err) {
panic(err)
}

if err := rpm.UpdateRepo(targetDirectory); err != nil {
panic(err)
}

Expand Down

0 comments on commit 7ced85c

Please sign in to comment.