From 9cdae6e3047d6e60dc8f189bc6cbd4cdcabd718b Mon Sep 17 00:00:00 2001 From: "Aaron H. Alpar" Date: Tue, 22 Nov 2022 11:45:18 -0800 Subject: [PATCH] fixup for lint --- repo/content/committed_read_manager.go | 6 +----- repo/format/upgrade_lock.go | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/repo/content/committed_read_manager.go b/repo/content/committed_read_manager.go index 439bf519b..6b7ac7457 100644 --- a/repo/content/committed_read_manager.go +++ b/repo/content/committed_read_manager.go @@ -124,11 +124,7 @@ func (sm *SharedManager) LoadIndexBlob(ctx context.Context, ibid blob.ID, d gath if err != nil { return nil, err } - q, err := ParseIndexBlob(ibid, d.Bytes(), sm.format) - if err != nil { - return nil, err - } - return q, nil + return ParseIndexBlob(ibid, d.Bytes(), sm.format) } // IndexReaderV0 return an index reader for reading V0 indexes diff --git a/repo/format/upgrade_lock.go b/repo/format/upgrade_lock.go index 45def4877..30761d6bf 100644 --- a/repo/format/upgrade_lock.go +++ b/repo/format/upgrade_lock.go @@ -15,7 +15,7 @@ // during upgrade. BackupBlobIDPrefix = "kopia.repository.backup." - // LegacyIndexPoisonBlobID used to pollute V0 indexes after upgrade to prevent legacy clients from corrupting V1 indexes + // LegacyIndexPoisonBlobID used to pollute V0 indexes after upgrade to prevent legacy clients from corrupting V1 indexes. LegacyIndexPoisonBlobID = "n00000000000000000000000000000000-repository_unreadable_by_this_kopia_version_upgrade_required" ) @@ -58,7 +58,7 @@ func (m *Manager) SetUpgradeLockIntent(ctx context.Context, l UpgradeLockIntent) return nil, errors.Wrap(err, "failed to backup the repo format blob") } - // set a new lock or revoke an existing lock + // set a new lock or revoke an existing lock. m.repoConfig.UpgradeLock = &l // mark the upgrade to the new format version, this will ensure that older // clients won't be able to parse the new version