| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | Coming from this bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11149 |
| 4 | |
| 5 | Nitin A Kamble <nitin.a.kamble@intel.com>2011/03/29 |
| 6 | |
| 7 | --- ldconfig-native-2.12.1.orig/ldconfig.c |
| 8 | +++ ldconfig-native-2.12.1/ldconfig.c |
| 9 | @@ -1359,14 +1359,9 @@ main (int argc, char **argv) |
| 10 | |
| 11 | const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; |
| 12 | if (opt_chroot) |
| 13 | - { |
| 14 | - aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); |
| 15 | - if (aux_cache_file == NULL) |
| 16 | - error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), |
| 17 | - _PATH_LDCONFIG_AUX_CACHE); |
| 18 | - } |
| 19 | + aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); |
| 20 | |
| 21 | - if (! opt_ignore_aux_cache) |
| 22 | + if (! opt_ignore_aux_cache && aux_cache_file) |
| 23 | load_aux_cache (aux_cache_file); |
| 24 | else |
| 25 | init_aux_cache (); |
| 26 | @@ -1376,7 +1371,8 @@ main (int argc, char **argv) |
| 27 | if (opt_build_cache) |
| 28 | { |
| 29 | save_cache (cache_file); |
| 30 | - save_aux_cache (aux_cache_file); |
| 31 | + if (aux_cache_file) |
| 32 | + save_aux_cache (aux_cache_file); |
| 33 | } |
| 34 | |
| 35 | return 0; |
| 36 | |