X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/blobdiff_plain/60db9fabc6aca55ad76fc8aae5b01e61eac38715..164c2063204d266072153bfaf499540d0df2c647:/dump-runlisp-image.c

diff --git a/dump-runlisp-image.c b/dump-runlisp-image.c
index 3f9131e..7d1d88f 100644
--- a/dump-runlisp-image.c
+++ b/dump-runlisp-image.c
@@ -982,6 +982,9 @@ static void finish_job(struct job *job)
        * job, because the chances are good that it failed to produce the
        * image properly.
        */
+      if (verbose >= 3)
+	moan("rename completed Lisp `%s' image `%s' to `%s'",
+	     JOB_NAME(job), job->imgnew, job->imghash);
       if (rename(job->imgnew, job->imghash)) {
 	fprintf(job->log, "%-13s > failed to rename Lisp `%s' "
 			  "output image `%s' to `%s': %s",
@@ -1001,6 +1004,9 @@ static void finish_job(struct job *job)
 	    JOB_NAME(job), job->imgnewlink, strerror(errno));
 	break;
       }
+      if (verbose >= 3)
+	moan("establish Lisp `%s' image link `%s' referring to `%s'",
+	     JOB_NAME(job), job->imglink, job->imghash);
       if (symlink(p, job->imgnewlink)) {
 	bad("failed to create Lisp `%s' image link `%s': %s",
 	    JOB_NAME(job), job->imgnewlink, strerror(errno));
@@ -1011,11 +1017,15 @@ static void finish_job(struct job *job)
 	    JOB_NAME(job), job->imgnewlink, job->imglink, strerror(errno));
 	break;
       }
-      if (job->oldimg && STRCMP(job->oldimg, !=, job->imghash) &&
-	  unlink(job->oldimg) && errno != ENOENT) {
-	if (verbose >= 1)
-	  moan("failed to delete old Lisp `%s' image `%s': %s",
-	       JOB_NAME(job), job->oldimg, strerror(errno));
+      if (job->oldimg && STRCMP(job->oldimg, !=, job->imghash)) {
+	if (verbose >= 3)
+	  moan("remove old Lisp `%s' image `%s'",
+	       JOB_NAME(job), job->oldimg);
+	if (unlink(job->oldimg) && errno != ENOENT) {
+	  if (verbose >= 1)
+	    moan("failed to delete old Lisp `%s' image `%s': %s",
+		 JOB_NAME(job), job->oldimg, strerror(errno));
+	}
       }
 
       /* I think we're all done. */
@@ -1648,7 +1658,7 @@ int main(int argc, char *argv[])
 	     JOB_NAME(job), job->oldimg);
     } else {
       if (verbose >= 2)
-	moan("deleting `%s' image `%s' (dry run)",
+	moan("deleting `%s' image `%s'",
 	     JOB_NAME(job), job->imglink);
       if (unlink(job->imglink) && errno != ENOENT)
 	bad("failed to delete `%s' image link `%s': %s",