summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-01-30 16:12:45 +0200
committerTimo Teräs <timo.teras@iki.fi>2015-01-30 16:12:45 +0200
commit43182c02f488a36f08310d74d40e3ff03b691775 (patch)
treef4aad2c87d854e0072b90266f3f0f8dbd55bb673 /src
parentcab03b6912ba4dc85d72ad0abfcd99f4fd935876 (diff)
downloadapk-tools-43182c02f488a36f08310d74d40e3ff03b691775.tar.gz
apk-tools-43182c02f488a36f08310d74d40e3ff03b691775.tar.bz2
apk-tools-43182c02f488a36f08310d74d40e3ff03b691775.tar.xz
apk-tools-43182c02f488a36f08310d74d40e3ff03b691775.zip
remove spurious audit message from missing files with --system
fixes #3840
Diffstat (limited to 'src')
-rw-r--r--src/audit.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/audit.c b/src/audit.c
index e7440de..35f79a6 100644
--- a/src/audit.c
+++ b/src/audit.c
@@ -244,9 +244,6 @@ recurse_check:
reason = 'A';
break;
}
- } else {
- if (protect_mode != APK_PROTECT_NONE)
- goto done;
}
dbf = apk_db_file_query(db, bdir, bent);
@@ -254,7 +251,8 @@ recurse_check:
reason = audit_file(actx, db, dbf, dirfd, name);
if (reason < 0)
goto done;
- if (reason == 'A' && actx->mode == MODE_SYSTEM)
+ if (actx->mode == MODE_SYSTEM &&
+ (reason == 'A' || protect_mode != APK_PROTECT_NONE))
goto done;
report_audit(actx, reason, bfull, dbf ? dbf->diri->pkg : NULL);
}