From d0c34d2f7428d84b83ca1bb2302061aaa8f80395 Mon Sep 17 00:00:00 2001 From: Drew Malin Date: Thu, 5 Mar 2026 08:51:27 -0800 Subject: [PATCH 1/2] fix(BRE2-800): Fix bug where deregister fails to delete etc data --- pkg/cmd/register/device_registration_store.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/register/device_registration_store.go b/pkg/cmd/register/device_registration_store.go index 102fe92c..7b01a35f 100644 --- a/pkg/cmd/register/device_registration_store.go +++ b/pkg/cmd/register/device_registration_store.go @@ -92,8 +92,8 @@ func (s *FileRegistrationStore) Delete() error { if err == nil { return nil } - if !os.IsPermission(err) { - return breverrors.WrapAndTrace(err) + if os.IsNotExist(err) { + return nil // already removed } // Fall back to sudo for non-root users. return sudoDeleteFile(path) From aff792e34f4c2f74ac9a349bf84b66122e6f076b Mon Sep 17 00:00:00 2001 From: Drew Malin Date: Thu, 5 Mar 2026 08:59:07 -0800 Subject: [PATCH 2/2] alternative fix --- pkg/cmd/register/device_registration_store.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/register/device_registration_store.go b/pkg/cmd/register/device_registration_store.go index 7b01a35f..86dba36b 100644 --- a/pkg/cmd/register/device_registration_store.go +++ b/pkg/cmd/register/device_registration_store.go @@ -3,7 +3,9 @@ package register import ( "bytes" "encoding/json" + "errors" "fmt" + "io/fs" "os" "os/exec" "path/filepath" @@ -92,8 +94,8 @@ func (s *FileRegistrationStore) Delete() error { if err == nil { return nil } - if os.IsNotExist(err) { - return nil // already removed + if !errors.Is(err, fs.ErrPermission) { + return breverrors.WrapAndTrace(err) } // Fall back to sudo for non-root users. return sudoDeleteFile(path)