fbuilder: don't consider flatpak/snapd directories

3 files changed, 6 insertions, 1 deletions

diff --git a/src/fbuilder/build_fs.c b/src/fbuilder/build_fs.c
index d3bf247f1..ede96c9b4 100644
--- a/src/fbuilder/build_fs.c
+++ b/src/fbuilder/build_fs.c
@@ -183,6 +183,8 @@ void build_var(const char *fname, FILE *fp) {
         assert(fname);
 
         var_skip = filedb_load_whitelist(var_skip, "whitelist-var-common.inc", "whitelist /var/");
+        var_skip = filedb_add(var_skip, "lib/flatpak");
+        var_skip = filedb_add(var_skip, "lib/snapd");
         process_files(fname, "/var", var_callback);
 
         // always whitelist /var
diff --git a/src/fbuilder/build_home.c b/src/fbuilder/build_home.c
index d6d421259..00f227c95 100644
--- a/src/fbuilder/build_home.c
+++ b/src/fbuilder/build_home.c
@@ -95,6 +95,9 @@ void process_home(const char *fname, char *home, int home_len) {
                     strcmp(ptr, ".bashrc") == 0)
                         continue;
 
+                // skip flatpak files
+                if (strncmp(ptr, ".local/share/flatpak", 20) == 0)
+                        continue;
 
                 // try to find the relevant directory for this file
                 char *dir = extract_dir(ptr);
diff --git a/src/fbuilder/filedb.c b/src/fbuilder/filedb.c
index 454b9f40b..569095785 100644
--- a/src/fbuilder/filedb.c
+++ b/src/fbuilder/filedb.c
@@ -96,7 +96,7 @@ FileDB *filedb_load_whitelist(FileDB *head, const char *fname, const char *prefi
                 errExit("asprintf");
         FILE *fp = fopen(f, "r");
         if (!fp) {
-                fprintf(stderr, "Error: cannot open whitelist-common.inc\n");
+                fprintf(stderr, "Error: cannot open %s\n", f);
                 free(f);
                 exit(1);
         }