From 2cafee86efe11b611dedd628172e2c0b0a05de80 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Mon, 3 Jun 2013 23:48:16 +0200 Subject: [PATCH 2/2] Add option to enable asking for optdeps. --- src/pacman/conf.c | 3 +++ src/pacman/conf.h | 1 + src/pacman/sync.c | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 5adc96c..183ac1c 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -491,6 +491,9 @@ static int _parse_options(const char *key, char *value, config->color = isatty(fileno(stdout)) ? PM_COLOR_ON : PM_COLOR_OFF; enable_colors(config->color); } + } else if(strcmp(key, "AskOptdeps") == 0) { + config->askoptdeps = 1; + pm_printf(ALPM_LOG_DEBUG, "config: askoptdeps\n"); } else { pm_printf(ALPM_LOG_WARNING, _("config file %s, line %d: directive '%s' in section '%s' not recognized.\n"), diff --git a/src/pacman/conf.h b/src/pacman/conf.h index dcd3204..bbed014 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -47,6 +47,7 @@ typedef struct __config_t { unsigned short checkspace; unsigned short usesyslog; unsigned short color; + unsigned short askoptdeps; double deltaratio; char *arch; char *print_format; diff --git a/src/pacman/sync.c b/src/pacman/sync.c index c94ce5d..686b5fa 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -571,7 +571,7 @@ static int process_pkg(alpm_pkg_t *pkg) } } config->explicit_adds = alpm_list_add(config->explicit_adds, pkg); - if(process_optdepends(pkg, ret)) { + if(config->askoptdeps && process_optdepends(pkg, ret)) { pm_printf(ALPM_LOG_WARNING, _("error processing optdepends: %s\n"), alpm_pkg_get_name(pkg)); } return 0; -- 1.8.3