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

[SCM] Debian package checker branch, master, updated. 2.5.10-49-gcb2eb24



The following commit has been merged in the master branch:
commit e97f2b6240e5f4f564174d4cbc9047220b34bf16
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 16 16:48:46 2012 +0200

    c/control-files: Migrate to Lintian::Path API
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/control-files b/checks/control-files
index 6a570fc..b86b6a7 100644
--- a/checks/control-files
+++ b/checks/control-files
@@ -54,7 +54,7 @@ foreach my $file (sort keys %$cindex) {
     # dir, but that /should/ the "empty file" case in the beginning of
     # the loop) In any event, allow directories just in case - the
     # check here is mostly to catch symlinks (and "devices" etc.)
-    if ($cindex_info->{type} !~ m/^[-d]$/o) {
+    if (not ($cindex_info->is_regular_file or $cindex_info->is_dir)) {
         tag 'control-file-is-not-a-file', $file;
         # Doing further checks is probably not going to yield anything
         # remotely useful.
@@ -75,7 +75,7 @@ foreach my $file (sort keys %$cindex) {
     $experm = $ctrl->value($file);
 
     # I'm not sure about the udeb case
-    if ($type ne 'udeb' and $cindex_info->{size} == 0) {
+    if ($type ne 'udeb' and $cindex_info->size == 0) {
         tag 'control-file-is-empty', $file;
     }
 
@@ -84,7 +84,7 @@ foreach my $file (sort keys %$cindex) {
     # this file isn't installed on the systems anyways)
     next if $file eq 'control';
 
-    $operm = $cindex_info->{operm};
+    $operm = $cindex_info->operm;
 
     # correct permissions?
     unless ($operm == $experm) {
@@ -92,7 +92,7 @@ foreach my $file (sort keys %$cindex) {
             sprintf('%s %04o != %04o', $file, $operm, $experm);
     }
 
-    $owner = $cindex_info->{owner} . '/' . $cindex_info->{group};
+    $owner = $cindex_info->owner . '/' . $cindex_info->group;
 
     # correct owner?
     unless ($owner eq 'root/root') {

-- 
Debian package checker


Reply to: