ubiformat: reverse question about vid offset change

Users can pass the -O option to ubiformat to override the VID header
offset on the command-line. If for some reason, the new offset does
not match what is on flash, ubiformat currently prompts the user if
they'd rather use the *old* offsets.  This means that calling
ubiformat with --yes will not do what was requested on the
command-line.

This patch reverses the question so --yes is actually useful for
running in batch-mode.

Signed-off-by: Bernard Blackham <bernard@largestprime.net>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/ubi-utils/new-utils/src/ubiformat.c b/ubi-utils/new-utils/src/ubiformat.c
index dc5dc442fa458038d146f7a6d5538fb34f231fc8..1fa14b341549ab5c0b460d14e5648a185433c759 100644 (file)
--- a/ubi-utils/new-utils/src/ubiformat.c
+++ b/ubi-utils/new-utils/src/ubiformat.c
@@ -675,12 +675,13 @@ int main(int argc, char * const argv[])
                                "which is different to calculated offsets %d and %d",
                                si->vid_hdr_offs, si->data_offs, ui.vid_hdr_offs,
                                ui.data_offs);
-                       normsg_cont("use old offsets %d and %d? (yes/no)  ",
+                       normsg_cont("use new offsets %d and %d? (yes/no)  ",
                                    si->vid_hdr_offs, si->data_offs);
                }
                if (args.yes || answer_is_yes()) {
                        if (args.yes && !args.quiet)
                                printf("yes\n");
+               } else {
                        ui.vid_hdr_offs = si->vid_hdr_offs;
                        ui.data_offs = si->data_offs;
                }