diff options
| author | Lukas Märdian <slyon@ubuntu.com> | 2021-10-01 12:39:40 +0200 |
|---|---|---|
| committer | Lukas Märdian <luk@slyon.de> | 2022-03-03 09:49:45 +0100 |
| commit | 5d7111f47065e55e4d30a6626ba5c82651521516 (patch) | |
| tree | 3aee13d09757745c561dc7b52f5aa17e6b93068b | |
| parent | c31c8cbf74b002f18228286bd4e4b20bc675e2ea (diff) | |
generate:dbus:util: glib 2.70 compat
g_spawn_check_exit_status is deprecated since libglib 2.70 and replaced
by g_spawn_check_wait_status
Gbp-Pq: Name glib-2.70-compat.patch
| -rw-r--r-- | src/dbus.c | 10 | ||||
| -rw-r--r-- | src/generate.c | 2 | ||||
| -rw-r--r-- | src/util.c | 2 |
3 files changed, 7 insertions, 7 deletions
@@ -110,7 +110,7 @@ _try_accept(bool accept, sd_bus_message *m, NetplanData *d, sd_bus_error *ret_er * Check return code/errors. */ kill(d->try_pid, signal); waitpid(d->try_pid, &status, 0); - g_spawn_check_exit_status(status, &error); + g_spawn_check_wait_status(status, &error); if (error != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "netplan try failed: %s", error->message); // LCOV_EXCL_LINE @@ -228,7 +228,7 @@ method_apply(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "cannot run netplan apply: %s", err->message); - g_spawn_check_exit_status(exit_status, &err); + g_spawn_check_wait_status(exit_status, &err); if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "netplan apply failed: %s\nstdout: '%s'\nstderr: '%s'", @@ -257,7 +257,7 @@ method_generate(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "cannot run netplan generate: %s", err->message); - g_spawn_check_exit_status(exit_status, &err); + g_spawn_check_wait_status(exit_status, &err); if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "netplan generate failed: %s\nstdout: '%s'\nstderr: '%s'", @@ -334,7 +334,7 @@ method_get(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "cannot run netplan get: %s", err->message); // LCOV_EXCL_LINE - g_spawn_check_exit_status(exit_status, &err); + g_spawn_check_wait_status(exit_status, &err); if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "netplan get failed: %s\nstdout: '%s'\nstderr: '%s'", err->message, stdout, stderr); // LCOV_EXCL_LINE @@ -380,7 +380,7 @@ method_set(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "cannot run netplan set %s: %s", config_delta, err->message); // LCOV_EXCL_LINE - g_spawn_check_exit_status(exit_status, &err); + g_spawn_check_wait_status(exit_status, &err); if (err != NULL) return sd_bus_error_setf(ret_error, SD_BUS_ERROR_FAILED, "netplan set failed: %s\nstdout: '%s'\nstderr: '%s'", err->message, stdout, stderr); // LCOV_EXCL_LINE diff --git a/src/generate.c b/src/generate.c index cccd47a..24e60a2 100644 --- a/src/generate.c +++ b/src/generate.c @@ -67,7 +67,7 @@ check_called_just_in_time() gint exit_code = 0; g_spawn_sync(NULL, (gchar**)argv2, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, &exit_code, NULL); /* return TRUE, if network.target is not yet active */ - return !g_spawn_check_exit_status(exit_code, NULL); + return !g_spawn_check_wait_status(exit_code, NULL); } g_free(output); return FALSE; @@ -188,7 +188,7 @@ systemd_escape(char* string) gchar *argv[] = {"bin" "/" "systemd-escape", string, NULL}; g_spawn_sync("/", argv, NULL, 0, NULL, NULL, &escaped, &stderrh, &exit_status, &err); - g_spawn_check_exit_status(exit_status, &err); + g_spawn_check_wait_status(exit_status, &err); if (err != NULL) { // LCOV_EXCL_START g_fprintf(stderr, "failed to ask systemd to escape %s; exit %d\nstdout: '%s'\nstderr: '%s'", string, exit_status, escaped, stderrh); |