mirrors/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-24 02:03:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make ldconfig message clearer

Browse Source 
[BZ #13983]
Let not confuse the user and think there's an error instead of
a warning.
This commit is contained in:
Andreas Jaeger 2012-05-09 06:08:28 +02:00
parent ee0db19075
commit 1db86e8845
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2012-05-09 Andreas Jaeger <aj@suse.de>
[BZ #13983]
* elf/ldconfig.c (parse_conf): Change string to make clear that
ldconfig only issued a warning if ld.so.conf does not exist.
2012-05-08 David S. Miller <davem@davemloft.net>
* sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_floor-vis3.S: Use

4
NEWS
View File

@ -23,8 +23,8 @@ Version 2.16
13854, 13871, 13872, 13873, 13879, 13883, 13884, 13885, 13886, 13892,
13895, 13908, 13910, 13911, 13912, 13913, 13914, 13915, 13916, 13917,
13918, 13919, 13920, 13921, 13922, 13923, 13924, 13926, 13927, 13928,
13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 14027, 14033,
14034, 14040, 14049, 14055, 14064
13938, 13941, 13942, 13963, 13967, 13970, 13973, 13979, 13983, 14027,
14033, 14034, 14040, 14049, 14055, 14064
* ISO C11 support:

6
elf/ldconfig.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1999-2011, 2012 Free Software Foundation, Inc.
/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1999.
@ -1061,7 +1061,9 @@ parse_conf (const char *filename, bool do_chroot)
if (file == NULL)
{
error (0, errno, _("Can't open configuration file %s"), canon);
error (0, errno, _("\
Warning: ignoring configuration file that cannot be opened: %s"),
canon);
if (canon != filename)
free ((char *) canon);
return;