uscan: Fix parsing of v4 watch file with @PACKAGE@ in URL

Ben Hutchingsrequested to merge
benh/devscripts:bug1112065 into main

With the introduction of version 5 watch files in commit e461cf20, the expansion of @-expressions was moved from the watch file parser to a later stage of processing.

The version 1-4 parser was changed to recognise when part of a URL contains an @-expression that will expand to a parenthesised regexp and so needs to be split off as a file pattern, just as if it contained a parenthesised regexp directly.

However, @PACKAGE@ does not expand to a regexp and should not be treated this way.

  • Add some more test cases for v4 watch files, including this specific problem
  • Fix this by tightening the regexp for @-expressions that should be split off

Closes: #1112065

Merge request reports