File tree Expand file tree Collapse file tree 1 file changed +13
-4
lines changed
Expand file tree Collapse file tree 1 file changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -43,9 +43,7 @@ mod spdx_expr_opt {
4343 D : de:: Deserializer < ' de > ,
4444 {
4545 match <Option < String > >:: deserialize ( deserializer) ? {
46- Some ( value) => Ok ( Some (
47- spdx:: Expression :: parse ( & value) . map_err ( de:: Error :: custom) ?,
48- ) ) ,
46+ Some ( value) => Ok ( Some ( Expression :: parse ( & value) . map_err ( de:: Error :: custom) ?) ) ,
4947 None => Ok ( None ) ,
5048 }
5149 }
7472 let mut vec = Vec :: new ( ) ;
7573
7674 while let Some ( v) = seq. next_element :: < String > ( ) ? {
77- let lic = spdx:: Licensee :: parse ( & v) . map_err ( |e| {
75+ // We need to allow deprecated identifiers since external dependencies
76+ // can use them even though they shouldn't
77+ let lic = spdx:: Licensee :: parse_mode (
78+ & v,
79+ spdx:: ParseMode {
80+ allow_deprecated : true ,
81+ allow_slash_as_or_operator : false ,
82+ allow_imprecise_license_names : false ,
83+ allow_postfix_plus_on_gpl : false ,
84+ } ,
85+ )
86+ . map_err ( |e| {
7887 de:: Error :: custom ( format ! ( "'{v}' is not a valid SPDX licensee: {e}" ) )
7988 } ) ?;
8089
You can’t perform that action at this time.
0 commit comments