From 637c0871735bfa08bedf7b3f48cf7f372a913d6f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 29 Oct 2015 07:16:49 +0100 Subject: [PATCH] xbps-*: do not log to console with syslog enabled. Close #123 --- NEWS | 5 +++++ bin/xbps-install/state_cb.c | 2 +- bin/xbps-reconfigure/main.c | 2 +- bin/xbps-remove/main.c | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index bf6f704a..36f160f3 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,10 @@ xbps-0.48 (???): + * xbps-{install,reconfigure,remove}(1): do not log to console when the + syslog option (xbps.d(5)) is enabled. Messages are send to stderr/stdout, + so that logging to the console duplicates them. Close #123 + https://github.com/voidlinux/xbps/issues/123 + * xbps-fbulk(1): now comes with a manual page for the section 1. * libxbps: implemented reverse conflicts. That means that just a single pkg diff --git a/bin/xbps-install/state_cb.c b/bin/xbps-install/state_cb.c index 692fcbeb..bcd8b1cc 100644 --- a/bin/xbps-install/state_cb.c +++ b/bin/xbps-install/state_cb.c @@ -42,7 +42,7 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbdata _unused) if ((xscd->xhp->flags & XBPS_FLAG_DISABLE_SYSLOG) == 0) { slog = true; - openlog("xbps-install", LOG_CONS, LOG_USER); + openlog("xbps-install", 0, LOG_USER); } switch (xscd->state) { diff --git a/bin/xbps-reconfigure/main.c b/bin/xbps-reconfigure/main.c index 2fd51534..814959a8 100644 --- a/bin/xbps-reconfigure/main.c +++ b/bin/xbps-reconfigure/main.c @@ -58,7 +58,7 @@ state_cb(const struct xbps_state_cb_data *xscd, void *cbd _unused) if ((xscd->xhp->flags & XBPS_FLAG_DISABLE_SYSLOG) == 0) { slog = true; - openlog("xbps-reconfigure", LOG_CONS, LOG_USER); + openlog("xbps-reconfigure", 0, LOG_USER); } switch (xscd->state) { diff --git a/bin/xbps-remove/main.c b/bin/xbps-remove/main.c index 1ea9337a..835792c8 100644 --- a/bin/xbps-remove/main.c +++ b/bin/xbps-remove/main.c @@ -70,7 +70,7 @@ state_cb_rm(const struct xbps_state_cb_data *xscd, void *cbdata _unused) if ((xscd->xhp->flags & XBPS_FLAG_DISABLE_SYSLOG) == 0) { slog = true; - openlog("xbps-remove", LOG_CONS, LOG_USER); + openlog("xbps-remove", 0, LOG_USER); } switch (xscd->state) {