[systemd-devel] syntax error in master

[Colin Walters]

See: 
http://build.gnome.org/continuous/buildmaster/builds/2014/11/11/23/build/log-systemd.txt

Perhaps something like this?

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index c5aeaac..afee131 100644
--- a/src/bus-proxyd/bus-proxyd.c
+++ b/src/bus-proxyd/bus-proxyd.c
@@ -1466,11 +1466,11 @@ int main(int argc, char *argv[]) {
 if (k == -ECONNRESET)
 r = 0;
 else {
-
-k = process_policy(a, b, m, p, 
ucred);
-if (k  0) {
-r = k;
-log_error(Failed to 
send message: %s, strerror(-r));
+k = process_policy(a, 
b, m, p, ucred);
+if (k  0) {
+r = k;
+
log_error(Failed to send message: %s, strerror(-r));
+}
 }
 
 goto finish;
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel

Re: [systemd-devel] syntax error in master

[Daniel Mack]

On 11/11/2014 03:31 PM, Colin Walters wrote:
 See: 
 http://build.gnome.org/continuous/buildmaster/builds/2014/11/11/23/build/log-systemd.txt
 
 Perhaps something like this?

My bad, sorry. I had a hunk confusion due to rebasing.
It's already reverted in master.


Daniel


 
 diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
 index c5aeaac..afee131 100644
 --- a/src/bus-proxyd/bus-proxyd.c
 +++ b/src/bus-proxyd/bus-proxyd.c
 @@ -1466,11 +1466,11 @@ int main(int argc, char *argv[]) {
  if (k == -ECONNRESET)
  r = 0;
  else {
 -
 -k = process_policy(a, b, m, 
 p, ucred);
 -if (k  0) {
 -r = k;
 -log_error(Failed to 
 send message: %s, strerror(-r));
 +k = 
 process_policy(a, b, m, p, ucred);
 +if (k  0) {
 +r = k;
 +
 log_error(Failed to send message: %s, strerror(-r));
 +}
  }
  
  goto finish;
 

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