mirror of https://github.com/ecmwf/eccodes.git
ECC-1322: grib_compare: Option '-e' generates dubious error message
This commit is contained in:
parent
e46a7a9fc1
commit
b323c5e3ec
|
@ -82,7 +82,8 @@ static int onlyListed = 1;
|
||||||
static int headerMode = 0;
|
static int headerMode = 0;
|
||||||
static int morein1 = 0;
|
static int morein1 = 0;
|
||||||
static int morein2 = 0;
|
static int morein2 = 0;
|
||||||
static int listFromCommandLine;
|
static int listFromCommandLine = 0;
|
||||||
|
static int editionIndependent = 0;
|
||||||
static int verbose = 0;
|
static int verbose = 0;
|
||||||
static double tolerance_factor = 1;
|
static double tolerance_factor = 1;
|
||||||
|
|
||||||
|
@ -216,6 +217,9 @@ int grib_tool_init(grib_runtime_options* options)
|
||||||
if (grib_options_on("c:") || grib_options_on("e"))
|
if (grib_options_on("c:") || grib_options_on("e"))
|
||||||
listFromCommandLine = 1;
|
listFromCommandLine = 1;
|
||||||
|
|
||||||
|
if (grib_options_on("e"))
|
||||||
|
editionIndependent = 1;
|
||||||
|
|
||||||
if (grib_options_on("a"))
|
if (grib_options_on("a"))
|
||||||
onlyListed = 0;
|
onlyListed = 0;
|
||||||
else
|
else
|
||||||
|
@ -1194,7 +1198,7 @@ static int compare_handles(grib_handle* h1, grib_handle* h2, grib_runtime_option
|
||||||
err++;
|
err++;
|
||||||
}
|
}
|
||||||
grib_keys_iterator_delete(iter);
|
grib_keys_iterator_delete(iter);
|
||||||
if (num_keys_in_namespace == 0) {
|
if (num_keys_in_namespace == 0 && !editionIndependent) {
|
||||||
printf("ERROR: namespace \"%s\" does not contain any key.\n", options->compare[i].name);
|
printf("ERROR: namespace \"%s\" does not contain any key.\n", options->compare[i].name);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue