diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-04-08 11:08:16 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2015-04-08 11:08:16 +0300 |
| commit | 23d0a2244aa712ca33aa4ea9655298c095b8f0ba (patch) | |
| tree | 03b38d91a7ea302bde66267d23319ab8cea70749 /src/audit.c | |
| parent | 941fc1b10c00e904fb9fbd7b82e61f8f12e210bb (diff) | |
| download | apk-tools-23d0a2244aa712ca33aa4ea9655298c095b8f0ba.tar.gz apk-tools-23d0a2244aa712ca33aa4ea9655298c095b8f0ba.tar.bz2 apk-tools-23d0a2244aa712ca33aa4ea9655298c095b8f0ba.tar.xz apk-tools-23d0a2244aa712ca33aa4ea9655298c095b8f0ba.zip | |
ignore .apk-new files for overlays
Diffstat (limited to 'src/audit.c')
| -rw-r--r-- | src/audit.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/audit.c b/src/audit.c index cb295b8..c09f994 100644 --- a/src/audit.c +++ b/src/audit.c @@ -111,7 +111,7 @@ static int audit_file(struct audit_ctx *actx, apk_checksum_compare(&fi.csum, &dbf->csum) != 0) rv = 'U'; else if (apk_checksum_compare(&fi.xattr_csum, &dbf->acl->xattr_csum) != 0) - rv = 'X'; + rv = 'x'; else if (S_ISLNK(fi.mode) && dbf->csum.type == APK_CHECKSUM_NONE) rv = 'U'; else if (actx->check_permissions) { @@ -260,6 +260,10 @@ recurse_check: if (actx->mode == MODE_SYSTEM && (reason == 'A' || protect_mode != APK_PROTECT_NONE)) goto done; + if (actx->mode == MODE_BACKUP && + reason == 'A' && + apk_blob_ends_with(bent, APK_BLOB_STR(".apk-new"))) + goto done; report_audit(actx, reason, bfull, dbf ? dbf->diri->pkg : NULL); } |