Changeset 2297 in MondoRescue

Timestamp:

Jul 23, 2009, 5:43:49 PM (15 years ago)

Author:

Bruno Cornec

Message:

Fix a remaining display error for 2.2.9. That version has been tested OK in a lab.

File:

• branches/2.2.9/mondo/src/mondorestore/mondo-prep.c (modified) (3 diffs)

branches/2.2.9/mondo/src/mondorestore/mondo-prep.c

@@ -790 +790 @@
             fclose(fin);
             unlink("/tmp/plexes");
-            /* retval+=res; */
         }
 #else
@@ -856 +855 @@
 
     res = run_program_and_log_output(program, FALSE);
+    if (res) {
+        mr_strcat(tmp, "...failed");
+    } else {
+        mr_strcat(tmp, "...OK");
+    }
+    log_to_screen(tmp);
+    paranoid_free(tmp);
+
     mr_asprintf(&tmp, "");
     if (res && strstr(program, "kludge")) {
@@ -875 +882 @@
             fprintf(g_fprep, "%s\n", program);
         }
+        if (retval) {
+            mr_strcat(tmp, "...failed");
+        } else {
+            mr_strcat(tmp, "...OK");
+        }
+
+        log_to_screen(tmp);
+        paranoid_free(tmp);
+
     }
     retval += res;
-    if (retval) {
-        mr_strcat(tmp, "...failed");
-    } else {
-        mr_strcat(tmp, "...OK");
-    }
-
-    log_to_screen(tmp);
-    paranoid_free(tmp);
-
     paranoid_free(program);
     system("sync");