linter: Move skipping files we never want to lint

This saves us from initializing the linter and reading the entire
payload.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/pakfire/linter-file.c b/src/pakfire/linter-file.c
index 18c85039774589f55c01566d10632538a41d6250..ad2973434595e55bf2c3f4c91491eaadd3bcacfe 100644 (file)
--- a/src/pakfire/linter-file.c
+++ b/src/pakfire/linter-file.c
@@ -504,20 +504,8 @@ int pakfire_linter_file_lint(struct pakfire_linter_file* lfile) {
        if (r < 0)
                return r;
 
-       // Skip firmware files
-       if (pakfire_file_matches(lfile->file, "/usr/lib/firmware/**"))
-               return 0;
-
-       // Skip GRUB files
-       else if (pakfire_file_matches(lfile->file, "/usr/lib/grub/**"))
-               return 0;
-
-       // Skip valgrind files
-       else if (pakfire_file_matches(lfile->file, "/usr/lib/valgrind/*"))
-               return 0;
-
        // Check debug files
-       else if (pakfire_file_matches(lfile->file, "/usr/lib/debug/**"))
+       if (pakfire_file_matches(lfile->file, "/usr/lib/debug/**"))
                return pakfire_linter_file_check_debug(lfile);
 
        // ELF Checks

diff --git a/src/pakfire/linter.c b/src/pakfire/linter.c
index 8606b2a9911b0c1170763fef59764b65c65fbc55..8052bd413ae9b12fa9eaa45813c74d4c16948394 100644 (file)
--- a/src/pakfire/linter.c
+++ b/src/pakfire/linter.c
@@ -352,6 +352,18 @@ static int pakfire_linter_payload(
        int fd = -EBADF;
        int r;
 
+       // Skip firmware files
+       if (pakfire_file_matches(file, "/usr/lib/firmware/**"))
+               return 0;
+
+       // Skip GRUB files
+       else if (pakfire_file_matches(file, "/usr/lib/grub/**"))
+               return 0;
+
+       // Skip valgrind files
+       else if (pakfire_file_matches(file, "/usr/lib/valgrind/*"))
+               return 0;
+
        // Fetch path
        const char* path = pakfire_file_get_path(file);