summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-23 08:05:02 +0200
committerDan McGee <dan@archlinux.org>2011-08-23 08:06:56 +0200
commita8a4395098b4ddced5204b386e476565e68508b5 (patch)
treefe35d8fe2031e1ef9a5fa3881a75cecbe0184108
parent6731d0a9407e00f755d237e889c2e3f5db9cd276 (diff)
downloadpacman-a8a4395098b4ddced5204b386e476565e68508b5.tar.gz
pacman-a8a4395098b4ddced5204b386e476565e68508b5.tar.xz
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 <dan@archlinux.org>
-rw-r--r--src/pacman/conf.c3
1 files changed, 3 insertions, 0 deletions
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);