diff options
| author | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-08-12 22:58:43 +0000 |
|---|---|---|
| committer | Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at> | 2013-08-12 22:58:43 +0000 |
| commit | c4f44df55fbe624e283ce3db83e1dea6925fd5da (patch) | |
| tree | 23f602150eecb4599d675e45ff1a61640953d52e /cli_classic.c | |
| parent | 463dd6953eed14930ae9819c7194ea1cc3b8ef40 (diff) | |
| download | ast2050-flashrom-c4f44df55fbe624e283ce3db83e1dea6925fd5da.zip ast2050-flashrom-c4f44df55fbe624e283ce3db83e1dea6925fd5da.tar.gz | |
Fix verification operation
I broke this in r1702 where I enabled avoidance of the verification step if
we did not modify anything in the erase/write step. The problem is that
all_skipped is initialized to true and hence it would only ever verify if
there have been changes noted in the erase/write step. This obviously
breaks the verification operation (-v/--verify) because there we never
enter the erase/write loop.
The better alternative would be to enable (the implicit) verification
in the write loop and not in cli_classic.c. This would require a bigger
change due to the existance of dont_verify_it. Eventually this is the
right thing to do but not so shortly before a release.
Corresponding to flashrom svn r1707.
Signed-off-by: Stefan Tauner <stefan.tauner@alumni.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'cli_classic.c')
| -rw-r--r-- | cli_classic.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cli_classic.c b/cli_classic.c index 089cf03..4c71d07 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -175,8 +175,7 @@ int main(int argc, char *argv[]) cli_classic_abort_usage(); } if (dont_verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); + fprintf(stderr, "--verify and --noverify are mutually exclusive. Aborting.\n"); cli_classic_abort_usage(); } filename = strdup(optarg); @@ -184,8 +183,7 @@ int main(int argc, char *argv[]) break; case 'n': if (verify_it) { - fprintf(stderr, "--verify and --noverify are" - "mutually exclusive. Aborting.\n"); + fprintf(stderr, "--verify and --noverify are mutually exclusive. Aborting.\n"); cli_classic_abort_usage(); } dont_verify_it = 1; |
