[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][lintian/lintian][master] [ci skip] Revert "Remove strict check for comma in "Origin" field in DEP3 header"

Title: GitLab

Nilesh Patra pushed to branch master at lintian / lintian

Commits:

  • 48d9e6fd
    by Nilesh Patra at 2024-05-06T22:55:35+05:30 
    [ci skip] Revert "Remove strict check for comma in "Origin" field in DEP3 header"

Revert this until we find a good solution to validate these.

This reverts commit a1805c7ab887cf6ed949b9dfe3fa271deb0eab9b.

1 changed file:

Changes:

  • lib/Lintian/Check/Debian/Patches/Dep3.pm
    ... ... @@ -80,16 +80,10 @@ sub visit_patched_files {
    80 80 
         # use last mention when present multiple times
    81 81 
         my $origin = $deb822->last_mention('Origin');
    82 82
    83 
    -    if ($origin =~ /,/) {
    84 
    -        my ($category, $origin_value) = split(m{\s*,\s*}, $origin, 2);
    85 
    -        $category //= $EMPTY;
    86 
    -        return
    87 
    -          if ($origin_value =~ /^(?:http|https):\/\/|commit:/)
    88 
    -          && any { $category eq $_ } qw(upstream backport);
    89 
    -    } else {
    90 
    -        $origin =~ s/\s//g;
    91 
    -        return if $origin =~ (/^(?:http|https):\/\/|commit:/);
    92 
    -    }
    83 
    +    my ($category) = split(m{\s*,\s*}, $origin, 2);
    84 
    +    $category //= $EMPTY;
    85 
    +    return
    86 
    +      if any { $category eq $_ } qw(upstream backport);
    93 87
    94 88 
         $self->pointed_hint('patch-not-forwarded-upstream', $item->pointer)
    95 89 
           if $deb822->last_mention('Forwarded') eq 'no'

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: