Commit 244f7624 authored by Felix Lechner's avatar Felix Lechner Committed by Chris Lamb

Revert "Fix use of uninitialized value in checks/files.pm."

This reverts commit d55f56ec.

Commit d55f56ec broke the following semantics:

  $ perl -we 'my $p = "usr/sbin/foo"; print "/$1bin/$2\n" if $p =~ m,^(usr/)?sbin/(.+),;'
  /usr/bin/foo
  $ perl -we 'my $p = "sbin/foo"; print "/$1bin/$2\n" if $p =~ m,^(usr/)?sbin/(.+),;'
  Use of uninitialized value $1 in concatenation (.) or string at -e line 1.
  /bin/foo

So if $fname starts with usr/sbin/ (resp. sbin/) a corresponding name
with the /usr/bin/ (resp. /bin/) prefix is appended to @bin_binaries.
It also spews a warning for sbin/; I guess the desired outcome is to
silence that warning but preserve the overall behavior, right?  This
is no longer what happens: while names starting with usr/sbin/ are
dealt with like before, those starting with sbin/ are now ignored.

More information may be available here:

  lintian/lintian!235 (comment 100475)

Thanks to Guilhem Moulin for pointing it out!

Gbp-Dch: ignore
parent 84b9e71a
...@@ -425,11 +425,8 @@ sub run { ...@@ -425,11 +425,8 @@ sub run {
# If we have a /usr/sbin/foo, check for references to # If we have a /usr/sbin/foo, check for references to
# /usr/bin/foo # /usr/bin/foo
if ($file->is_file) { push(@bin_binaries, "/$1bin/$2")
$fname =~ m,^(usr/)?sbin/(.+),; if $file->is_file and $fname =~ m,^(usr/)?sbin/(.+),;
push(@bin_binaries, "/$1bin/$2")
if length $1 && length $2;
}
$arch_dep_files = 1 $arch_dep_files = 1
if not $file->is_dir if not $file->is_dir
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment