diff options
| author | Michael Muré <batolettre@gmail.com> | 2019-02-24 12:58:04 +0100 |
|---|---|---|
| committer | Michael Muré <batolettre@gmail.com> | 2019-03-01 22:48:50 +0100 |
| commit | e100ee9f10dd7f600b58bf3d24b36f9b286210d6 (patch) | |
| tree | 0df0fb14642aeda9b21564112b5a876fc64b8990 /bridge/launchpad | |
| parent | b59623a835f1f922d06ff7212b5bf7825624d134 (diff) | |
| download | git-bug-e100ee9f10dd7f600b58bf3d24b36f9b286210d6.tar.gz | |
github: fix 3 edge-case failures
Diffstat (limited to 'bridge/launchpad')
| -rw-r--r-- | bridge/launchpad/import.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bridge/launchpad/import.go b/bridge/launchpad/import.go index b70d34f0..30ec5c3f 100644 --- a/bridge/launchpad/import.go +++ b/bridge/launchpad/import.go @@ -23,7 +23,7 @@ func (li *launchpadImporter) Init(conf core.Configuration) error { const keyLaunchpadID = "launchpad-id" const keyLaunchpadLogin = "launchpad-login" -func (li *launchpadImporter) makePerson(repo *cache.RepoCache, owner LPPerson) (*cache.IdentityCache, error) { +func (li *launchpadImporter) ensurePerson(repo *cache.RepoCache, owner LPPerson) (*cache.IdentityCache, error) { // Look first in the cache i, err := repo.ResolveIdentityImmutableMetadata(keyLaunchpadLogin, owner.Login) if err == nil { @@ -67,7 +67,7 @@ func (li *launchpadImporter) ImportAll(repo *cache.RepoCache) error { return err } - owner, err := li.makePerson(repo, lpBug.Owner) + owner, err := li.ensurePerson(repo, lpBug.Owner) if err != nil { return err } @@ -100,7 +100,7 @@ func (li *launchpadImporter) ImportAll(repo *cache.RepoCache) error { // The Launchpad API returns the bug description as the first // comment, so skip it. for _, lpMessage := range lpBug.Messages[1:] { - _, err := b.ResolveTargetWithMetadata(keyLaunchpadID, lpMessage.ID) + _, err := b.ResolveOperationWithMetadata(keyLaunchpadID, lpMessage.ID) if err != nil && err != cache.ErrNoMatchingOp { return errors.Wrapf(err, "failed to fetch comments for bug #%s", lpBugID) } @@ -113,14 +113,14 @@ func (li *launchpadImporter) ImportAll(repo *cache.RepoCache) error { continue } - owner, err := li.makePerson(repo, lpMessage.Owner) + owner, err := li.ensurePerson(repo, lpMessage.Owner) if err != nil { return err } // This is a new comment, we can add it. createdAt, _ := time.Parse(time.RFC3339, lpMessage.CreatedAt) - err = b.AddCommentRaw( + _, err = b.AddCommentRaw( owner, createdAt.Unix(), lpMessage.Content, |