Call delete_staging_dir() only on read-write mount

[wimlib] / src / mount.c

diff --git a/src/mount.c b/src/mount.c
index 844bb34d36c5bec0e1b9b43e9e837fb87aac9e63..bd02cec6ae3f1168cb853d779dca38462c06cd42 100644 (file)
--- a/src/mount.c
+++ b/src/mount.c
@@ -374,9 +374,6 @@ static int rebuild_wim(WIMStruct *w, bool check_integrity)
                ERROR("Failed to commit changes\n");
                return ret;
        }
-       ret = delete_staging_dir();
-       if (ret != 0)
-               ERROR("Failed to delete the staging directory: %m\n");
        return ret;
 }
 
@@ -430,22 +427,28 @@ static void wimfs_destroy(void *p)
                DEBUG("Received message: [%d %d]\n", msg[0], msg[1]);
        }
 
-       if (commit && (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE)) {
-               status = chdir(working_directory);
-               if (status != 0) {
-                       ERROR("chdir(): %m\n");
-                       status = WIMLIB_ERR_NOTDIR;
-                       goto done;
+       status = 0;
+       if (mount_flags & WIMLIB_MOUNT_FLAG_READWRITE) {
+               if (commit) {
+                       status = chdir(working_directory);
+                       if (status != 0) {
+                               ERROR("chdir(): %m\n");
+                               status = WIMLIB_ERR_NOTDIR;
+                               goto done;
+                       }
+                       status = rebuild_wim(w, (check_integrity != 0));
+               }
+               ret = delete_staging_dir();
+               if (ret != 0) {
+                       ERROR("Failed to delete the staging directory: %m\n");
+                       if (status == 0)
+                               status = ret;
                }
-               status = rebuild_wim(w, (check_integrity != 0));
-       } else {
-               status = 0;
        }
 done:
        ret = mq_send(daemon_to_unmount_mq, &status, 1, 1);
-       if (ret == -1) {
+       if (ret == -1)
                ERROR("Failed to send status to unmount process: %m\n");
-       }
        close_message_queues();
 }