Attachment 1524382 Details for Bug 1670191 – 0001-Use-external-command-mv-to-rename-old-output-directo.patch

0001-Use-external-command-mv-to-rename-old-output-directo.patch

0001-Use-external-command-mv-to-rename-old-output-directo.patch (text/plain), 1.16 KB, created by Richard W.M. Jones on 2019-01-28 22:23:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Richard W.M. Jones

Created: 2019-01-28 22:23:10 UTC

Size: 1.16 KB

patch

obsolete

>From 463ade3f95d4c979c196e6158f404ee3ee93f6a7 Mon Sep 17 00:00:00 2001
>From: "Richard W.M. Jones" <rjones@redhat.com>
>Date: Mon, 28 Jan 2019 22:20:33 +0000
>Subject: [PATCH] Use external command mv to rename old output directory
> (RHBZ#1670191).
>
>See https://bugzilla.redhat.com/show_bug.cgi?id=1670191#c0
>for explanation.
>---
> src/supermin.ml | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
>diff --git a/src/supermin.ml b/src/supermin.ml
>index 71d8b64..7c7135b3 100644
>--- a/src/supermin.ml
>+++ b/src/supermin.ml
>@@ -264,12 +264,10 @@ appliance automatically.
> 
>   (* Delete the old output directory if it exists. *)
>   let old_outputdir =
>-    try
>-      let old_outputdir = outputdir ^ "." ^ string_random8 () in
>-      rename outputdir old_outputdir;
>-      Some old_outputdir
>-    with
>-      Unix_error _ -> None in
>+    let old_outputdir = outputdir ^ "." ^ string_random8 () in
>+    let cmd = sprintf "mv %s %s 2>/dev/null"
>+                      (quote outputdir) (quote old_outputdir) in
>+    if Sys.command cmd == 0 then Some old_outputdir else None in
> 
>   if debug >= 1 then
>     printf "supermin: renaming %s to %s\n%!" new_outputdir outputdir;
>-- 
>2.20.1
>

Actions: View

Attachments on bug 1670191: 1524382