[SCM] Debian package checker branch, master, updated. 2.5.12-7-g3eee47f
The following commit has been merged in the master branch:
commit 3eee47fd598196fd0c23577b584cae2b46a358ef
Author: Niels Thykier <niels@thykier.net>
Date: Sat Apr 20 11:02:49 2013 +0200
checks/*: Remove unused arguments for "file is utf8"
L::Util's file_is_encoded_in_non_utf8 now only takes a single
argument, so update callers accordingly.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/changelog-file b/checks/changelog-file
index 9084ca7..ef99339 100644
--- a/checks/changelog-file
+++ b/checks/changelog-file
@@ -122,7 +122,7 @@ foreach ($info->sorted_index) {
my $news;
my $dnews = $info->lab_data_path ('NEWS.Debian');
if (-f $dnews) {
- my $line = file_is_encoded_in_non_utf8 ($dnews, $type, $pkg);
+ my $line = file_is_encoded_in_non_utf8($dnews);
if ($line) {
tag 'debian-news-file-uses-obsolete-national-encoding', "at line $line"
}
@@ -233,7 +233,7 @@ unless (-f $dchpath) {
}
# check that changelog is UTF-8 encoded
-my $line = file_is_encoded_in_non_utf8 ($dchpath, $type, $pkg);
+my $line = file_is_encoded_in_non_utf8($dchpath);
if ($line) {
tag 'debian-changelog-file-uses-obsolete-national-encoding', "at line $line"
}
diff --git a/checks/control-file b/checks/control-file
index 346174d..67f8d2a 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -39,7 +39,7 @@ my $src_fields = Lintian::Data->new('common/source-fields');
sub run {
-my ($pkg, $type, $info) = @_;
+my ($pkg, undef, $info) = @_;
my $dcontrol = $info->debfiles('control');
@@ -48,7 +48,7 @@ if (-l $dcontrol) {
}
# check that control is UTF-8 encoded
-my $line = file_is_encoded_in_non_utf8($dcontrol, $type, $pkg);
+my $line = file_is_encoded_in_non_utf8($dcontrol);
if ($line) {
tag 'debian-control-file-uses-obsolete-national-encoding', "at line $line"
}
diff --git a/checks/copyright-file b/checks/copyright-file
index eb474ea..a7b22e4 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -34,7 +34,7 @@ our $KNOWN_ESSENTIAL = Lintian::Data->new('fields/essential');
sub run {
-my ($pkg, $type, $info, undef, $group) = @_;
+my ($pkg, undef, $info, undef, $group) = @_;
my $found = 0;
my $linked = 0;
@@ -99,7 +99,7 @@ if (not $found) {
my $dcopy = $info->lab_data_path ('copyright');
# check that copyright is UTF-8 encoded
-my $line = file_is_encoded_in_non_utf8 ($dcopy, $type, $pkg);
+my $line = file_is_encoded_in_non_utf8($dcopy);
if ($line) {
tag 'debian-copyright-file-uses-obsolete-national-encoding', "at line $line"
}
diff --git a/checks/menus b/checks/menus
index 097e6e8..9ccd95a 100644
--- a/checks/menus
+++ b/checks/menus
@@ -183,7 +183,7 @@ if ($docbase_file) {
# don't try to parse executables, plus we already warned about it
# - skip symlinks as well, unlikely to be used for real doc-base files.
next if -x $dbfile or -l $dbfile;
- check_doc_base_file ($dbfile, $dbpath, $pkg, $type, \%all_files, \%all_links,
+ check_doc_base_file ($dbfile, $dbpath, $pkg, \%all_files, \%all_links,
$group);
}
closedir($dirfd);
@@ -228,9 +228,9 @@ if ($anymenu_file) {
# -----------------------------------
sub check_doc_base_file {
- my ($dbfile, $dbpath, $pkg, $type, $all_files, $all_links, $group) = @_;
+ my ($dbfile, $dbpath, $pkg, $all_files, $all_links, $group) = @_;
- my $line = file_is_encoded_in_non_utf8 ($dbpath, $type, $pkg);
+ my $line = file_is_encoded_in_non_utf8($dbpath);
if ($line) {
tag 'doc-base-file-uses-obsolete-national-encoding', "$dbfile:$line";
}
--
Debian package checker
Reply to: