Re: [systemd-devel] [PATCH] systemctl: Correct error message printed when bus_process_wait fails

2014-08-26 Thread Lennart Poettering
On Sat, 23.08.14 21:11, Sjoerd Simons (sjoerd.sim...@collabora.co.uk) wrote:

> Actually use the variable containing the return code of bus_process_wait when
> printing the error message as a result of it failing.

Thanks! Applied!

> ---
>  src/systemctl/systemctl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
> index d9b8bee..6534819 100644
> --- a/src/systemctl/systemctl.c
> +++ b/src/systemctl/systemctl.c
> @@ -2382,7 +2382,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
>  while (!set_isempty(s)) {
>  q = bus_process_wait(bus);
>  if (q < 0) {
> -log_error("Failed to wait for response: %s", 
> strerror(-r));
> +log_error("Failed to wait for response: %s", 
> strerror(-q));
>  return q;
>  }
>  


Lennart

-- 
Lennart Poettering, Red Hat
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel


[systemd-devel] [PATCH] systemctl: Correct error message printed when bus_process_wait fails

2014-08-23 Thread Sjoerd Simons
Actually use the variable containing the return code of bus_process_wait when
printing the error message as a result of it failing.
---
 src/systemctl/systemctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index d9b8bee..6534819 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -2382,7 +2382,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) {
 while (!set_isempty(s)) {
 q = bus_process_wait(bus);
 if (q < 0) {
-log_error("Failed to wait for response: %s", 
strerror(-r));
+log_error("Failed to wait for response: %s", 
strerror(-q));
 return q;
 }
 
-- 
2.1.0

___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel