Page MenuHomeSoftware Heritage

metadata/maven: Ignore ill-formed xml instead of failing
ClosedPublic

Authored by ardumont on May 28 2021, 3:17 PM.

Diff Detail

Repository
rDCIDX Metadata indexer
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D5799 (id=20715)

Could not rebase; Attempt merge onto 8fd4846af5...

Updating 8fd4846..13ac64d
Fast-forward
 swh/indexer/metadata.py                  | 5 +++--
 swh/indexer/metadata_dictionary/maven.py | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)
Changes applied before test
commit 13ac64d8195c1aeb9bee8014932cdc919c70af3f
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri May 28 15:15:11 2021 +0200

    metadata/maven: Ignore ill-formed xml instead of failing
    
    This fixes error instances [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/a5869f724a244fdab2e1cb0303a12fc1/

commit ff0b60e84e404e9dc9bf93210d248f4a6f87b237
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri May 28 15:02:24 2021 +0200

    metadata: Fix UnboundLocalError in edge case
    
    This fixes occurrences of [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/4b92519efe2a4ddd9455f0d600a614b9/

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/179/ for more details.

Rebase and Improve log message

Build is green

Patch application report for D5799 (id=20718)

Could not rebase; Attempt merge onto 8fd4846af5...

Updating 8fd4846..97c9338
Fast-forward
 swh/indexer/metadata.py                  | 7 ++++---
 swh/indexer/metadata_dictionary/maven.py | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
Changes applied before test
commit 97c933816943b1cd38418ebcea6b6a0430dac26b
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri May 28 15:15:11 2021 +0200

    metadata/maven: Ignore ill-formed xml instead of failing
    
    This fixes error instances [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/a5869f724a244fdab2e1cb0303a12fc1/

commit cf598baacb1efdfdf205c57a902be9f06cd6c523
Author: Antoine R. Dumont (@ardumont) <ardumont@softwareheritage.org>
Date:   Fri May 28 15:02:24 2021 +0200

    metadata: Fix UnboundLocalError in edge case
    
    This fixes occurrences of [1]
    
    [1] https://sentry.softwareheritage.org/share/issue/4b92519efe2a4ddd9455f0d600a614b9/

See https://jenkins.softwareheritage.org/job/DCIDX/job/tests-on-diff/181/ for more details.

This revision is now accepted and ready to land.May 28 2021, 4:01 PM