From 469a86ffdec95416953d7617b85557743b2ae729 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Wed, 10 May 2023 12:19:01 -0400 Subject: [PATCH] fix(backend): delete non-existing repo Fixes: 6eba2455d03c ("fix(backend): delete repo when importing existing one") --- server/backend/sqlite/sqlite.go | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/server/backend/sqlite/sqlite.go b/server/backend/sqlite/sqlite.go index d45a9f4052394438b56ac5719afb3e15c25d0eb8..51090683ad17b54ee9a031965bb30cbf9a9c4bd5 100644 --- a/server/backend/sqlite/sqlite.go +++ b/server/backend/sqlite/sqlite.go @@ -223,18 +223,14 @@ func (d *SqliteBackend) DeleteRepository(name string) error { name = utils.SanitizeRepo(name) repo := name + ".git" rp := filepath.Join(d.reposPath(), repo) - if _, err := os.Stat(rp); err != nil { - return os.ErrNotExist - } - if err := wrapTx(d.db, d.ctx, func(tx *sqlx.Tx) error { + return wrapTx(d.db, d.ctx, func(tx *sqlx.Tx) error { + if err := os.RemoveAll(rp); err != nil { + return err + } _, err := tx.Exec("DELETE FROM repo WHERE name = ?;", name) return err - }); err != nil { - return wrapDbErr(err) - } - - return os.RemoveAll(rp) + }) } // RenameRepository renames a repository.