This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=e82c6604e976f011923e9c460f372b2021918dd7 commit e82c6604e976f011923e9c460f372b2021918dd7 Author: Guillem Jover <[email protected]> AuthorDate: Fri Oct 7 23:41:42 2022 +0200 dpkg-source: Fix confusing regex match for option arguments For the «--diff-ignore» option we were using a single regex to match it with or without arguments. Which resulted in a premature end of string marker followed by optional capturing group and another end of string marker. This is rather confusing, so split it into two regexes. --- scripts/dpkg-source.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index 51e9a4619..ba77f8682 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -170,7 +170,9 @@ while (@options) { $override{$1} = $2; } elsif (m/^-U([^\=:]+)$/) { $remove{$1} = 1; - } elsif (m/^-(?:i|-diff-ignore(?:$|=))(.*)$/) { + } elsif (m/^--diff-ignore$/) { + $options{diff_ignore_regex} = $diff_ignore_regex; + } elsif (m/^-(?:i|-diff-ignore=)(.*)$/) { $options{diff_ignore_regex} = $1 ? $1 : $diff_ignore_regex; } elsif (m/^--extend-diff-ignore=(.+)$/) { $diff_ignore_regex .= "|$1"; -- Dpkg.Org's dpkg
