Skip to content

Commit

Permalink
dd: don't warn about missing 'type' if the locking fails
Browse files Browse the repository at this point in the history
The warning is printed out at least 10 times and makes only a little
sense to system administrators. abrtd follows those warnings with "$path
is not a valid problem directory" message which is a sufficient way to
tell the administrators to remove that directory.

Related: #1243280

Signed-off-by: Jakub Filak <jfilak@redhat.com>
  • Loading branch information
Jakub Filak committed Aug 13, 2015
1 parent aebf11f commit 04c86e6
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/lib/dump_dir.c
Expand Up @@ -303,7 +303,16 @@ static const char *dd_check(struct dump_dir *dd)
return FILENAME_TIME;
}

dd->dd_type = load_text_file_at(dd->dd_fd, FILENAME_TYPE, DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE);
/* Do not warn about missing 'type' file in non-verbose modes.
*
* Handling of FILENAME_TYPE should be consistent with handling of
* FILENAME_TIME in the function parse_time_file_at() where the missing
* file message is printed only if VERB2 is satisfied.
*/
int load_flags = DD_LOAD_TEXT_RETURN_NULL_ON_FAILURE;
if (g_verbose < 2) load_flags |= DD_FAIL_QUIETLY_ENOENT;

dd->dd_type = load_text_file_at(dd->dd_fd, FILENAME_TYPE, load_flags);
if (!dd->dd_type || (strlen(dd->dd_type) == 0))
{
log_debug("Missing or empty file: "FILENAME_TYPE);
Expand Down

0 comments on commit 04c86e6

Please sign in to comment.