Changeset 3308 in MondoRescue for branches

Timestamp:

Jul 3, 2014, 9:13:27 PM (11 years ago)

Author:

Bruno Cornec

Message:

• Do not remove spaces in analyze of good format as that create a failure if only one format is returned.

Location:

branches/3.2/mondo/src/common

Files:

• libmondo-devices.c (modified) (1 diff)
• libmondo-mountlist.c (modified) (1 diff)

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -1040 +1040 @@
         mr_asprintf(good_formats, " %s",p);
         (void)pclose(pin);
-        mr_strip_spaces(good_formats);
         mr_strcat(good_formats, " swap lvm raid ntfs-3g ntfs 7 ");  // " ntfs 7 " -- um, cheating much? :)
         if (strstr(good_formats, format_sz)) {

branches/3.2/mondo/src/common/libmondo-mountlist.c

@@ -305 +305 @@
                 }
                 /* is format sensible? */
-                if (!is_this_a_valid_disk_format
-                    (mountlist->el[pos].format)) {
+                if (!is_this_a_valid_disk_format(mountlist->el[pos].format)) {
                     mr_asprintf(tmp, " %s has unsupported format %s.", device, mountlist->el[pos].format);
                     log_it(tmp);