summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2023-01-13 10:00:37 +0200
committerMichal Domonkos <mdomonko@redhat.com>2023-03-13 15:32:25 +0100
commit8b5cce9a68f93a3b7826a9de6547341855e9dfe2 (patch)
tree60ec2ecd19f0bee0fb4ee1b8f979304d0d9f0b0f
parente10255a7427ba0bf1f509afe9f5a9f1ead23cd99 (diff)
downloadrpm-8b5cce9a68f93a3b7826a9de6547341855e9dfe2.tar.gz
Use fd-based ops for metadata in FA_TOUCH mode too, when possible
Fixes another brainfart in commit 25a435e90844ea98fe5eb7bef22c1aecf3a9c033. (cherry picked from commit 932013698149d43720cc321c8df2f99f51866e18)
-rw-r--r--lib/fsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/fsm.c b/lib/fsm.c
index 5cfc497bc..d8bf82a6d 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1014,6 +1014,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
rc = RPMERR_UNKNOWN_FILETYPE;
}
+setmeta:
/* Special files require path-based ops */
int mayopen = S_ISREG(fp->sb.st_mode) || S_ISDIR(fp->sb.st_mode);
if (!rc && fd == -1 && mayopen) {
@@ -1024,7 +1025,6 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
rc = RPMERR_OPEN_FAILED;
}
-setmeta:
if (!rc && fp->setmeta) {
rc = fsmSetmeta(fd, di.dirfd, fp->fpath,
fi, plugins, fp->action,