From a8a4395098b4ddced5204b386e476565e68508b5 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 23 Aug 2011 01:05:02 -0500 Subject: Retrieve default SigLevel value from backend after initial setting This ensures we grab and use the library default once we have processed the global SigLevel setting, but before processing the repo-specific settings. This means the following two configs will now evaluate the same, as the backend currently defaults to 'Optional': Config 1: [options] # nothing here [repo] SigLevel = TrustAll Config 2: [options] SigLevel = Optional [repo] SigLevel = TrustAll Signed-off-by: Dan McGee --- src/pacman/conf.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/pacman') diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 29e835ce..fe858499 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -563,6 +563,9 @@ static int setup_libalpm(void) if(config->siglevel != ALPM_SIG_USE_DEFAULT) { alpm_option_set_default_siglevel(handle, config->siglevel); } + /* retrieve the set or default siglevel from the backend at this point; + * this way all future DB settings base their setting off this value */ + config->siglevel = alpm_option_get_default_siglevel(handle); if(config->xfercommand) { alpm_option_set_fetchcb(handle, download_with_xfercommand); -- cgit v1.2.3-70-g09d2