Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint

Finishing touches to a topic already in 'master'.

* cc/subprocess-handshake-missing-capabilities:
subprocess: loudly die when subprocess asks for an unsupported capability

diff --git a/sub-process.c b/sub-process.c
index 648b3a3943d68eb8a6cfc975541df8df152c4a45..80571567f2a64be451fe2ac92c230f66fa04c844 100644 (file)
--- a/sub-process.c
+++ b/sub-process.c
@@ -180,8 +180,8 @@ static int handshake_capabilities(struct child_process *process,
                        if (supported_capabilities)
                                *supported_capabilities |= capabilities[i].flag;
                } else {
-                       warning("subprocess '%s' requested unsupported capability '%s'",
-                               process->argv[0], p);
+                       die("subprocess '%s' requested unsupported capability '%s'",
+                           process->argv[0], p);
                }
        }