search

serpent-os / boulder-d-legacy

Replaced by Rust tooling
https://serpentos.com
21 stars 7 forks source link

drafter: Add extra checks for isTraditionalLicense #79

Closed ermo closed 1 year ago

ermo commented 1 year ago

Add a try-catch with a useful error message if we hit a false positive that we aren't yet actively excluding for increased introspection ability.

ermo commented 1 year ago

Before:

boulder new https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.2/shared-mime-info-2.2.tar.gz -d
[20:04:14] TRACE     Preloading license data
[20:04:14] INFO      Beginning download
[20:04:15] TRACE     Download of shared-mime-info-2.2.tar.gz finished [code: 200]
[20:04:15] INFO      Downloaded: /tmp/boulderDrafterURI-ihsNci
[20:04:15] INFO      Extracting: /tmp/boulderDrafterURI-ihsNci
[20:04:15] INFO      Computing hash for /tmp/boulderDrafterURI-ihsNci
[20:04:15] TRACE     Using MetataHelper: Basic
[20:04:15] INFO      Scanning sources under /tmp/boulderDrafterExtraction.zEKb7o
[20:04:15] INFO      Analysing source trees
[20:04:15] TRACE     [LICENSE] shared-mime-info-2.2/COPYING: GPL-2.0-or-later (Confidence: 1.00)
[20:04:16] WARNING   Unknown license for: shared-mime-info-2.2/tests/mime-detection/COPYING-encrypted.asc
[20:04:16] TRACE     [LICENSE] shared-mime-info-2.2/tests/mime-detection/COPYING-clearsign.asc: GPL-2.0-or-later (Confidence: 0.95)
[20:04:16] TRACE     Removing: /tmp/boulderDrafterURI-ihsNci
[20:04:16] TRACE     Removing: /tmp/boulderDrafterExtraction.zEKb7o
std.utf.UTFException@/home/ermo/dlang/ldc-1.31.0/bin/../import/std/utf.d(1556): Invalid UTF-8 sequence (at index 1)
----------------
??:? [0x5be7a6]
??:? [0x5c02b6]
??:? [0x5a1e1f]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/utf.d [0x408b22]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/utf.d:1186 [0x408990]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/range/primitives.d:2520 [0x4f84f5]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/algorithm/iteration.d:576 [0x4f8f98]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/format/internal/write.d:1578 [0x4f8adf]
/home/ermo/dlang/ldc-1.31.0/bin/../import/std/format/internal/write.d:2683 [0x4f5bba]
../source/drafter/license/engine.d:108 [0x4f5d17]
../subprojects/libmoss/source/moss/deps/analysis/analyser.d:229 [0x509bcb]
../subprojects/libmoss/source/moss/deps/analysis/analyser.d:176 [0x5099dc]
mixin_generated_code.txt:1057 [0x50a4b2]
??:? [0x57970f]
??:? [0x59b023]
??:? [0x7f3219ad112c]
??:? [0x7f3219b52bbf]

after:

boulder new https://gitlab.freedesktop.org/xdg/shared-mime-info/-/archive/2.2/shared-mime-info-2.2.tar.gz -d
[21:06:09] TRACE     Preloading license data
[21:06:09] INFO      Beginning download
[21:06:11] TRACE     Download of shared-mime-info-2.2.tar.gz finished [code: 200]
[21:06:11] INFO      Downloaded: /tmp/boulderDrafterURI-EW2gHu
[21:06:11] INFO      Extracting: /tmp/boulderDrafterURI-EW2gHu
[21:06:11] INFO      Computing hash for /tmp/boulderDrafterURI-EW2gHu
[21:06:11] TRACE     Using MetataHelper: Basic
[21:06:11] INFO      Scanning sources under /tmp/boulderDrafterExtraction.RBavbh
[21:06:11] INFO      Analysing source trees
[21:06:12] WARNING   Unknown license for: shared-mime-info-2.2/tests/mime-detection/COPYING-encrypted.asc
[21:06:12] TRACE     [LICENSE] shared-mime-info-2.2/COPYING: GPL-2.0-or-later (Confidence: 1.00)
[21:06:12] TRACE     [LICENSE] shared-mime-info-2.2/tests/mime-detection/COPYING-clearsign.asc: GPL-2.0-or-later  (Confidence: 0.95)
[21:06:12] TRACE     Removing: /tmp/boulderDrafterURI-EW2gHu
[21:06:12] TRACE     Removing: /tmp/boulderDrafterExtraction.RBavbh
[21:06:12] INFO      Successfully wrote skeletal recipe stone.yml
ermo commented 1 year ago

ermo if you're ack-ing it, I can merge FWIW. Ikey Doherty Acky acky