dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

various: fix error message for bus_wait_for_jobs_new()

Browse Source 
As pointed out by Mike Yuan in review of grandparent commit,
bus_wait_for_jobs_new() can also fail for non-oom reasons.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-05-26 15:09:03 +02:00
parent b2ce20aa0c
commit f3f8bd6a38
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/run/run.c
View File

@@ -1483,7 +1483,7 @@ static int start_transient_scope(sd_bus *bus) {
r = bus_wait_for_jobs_new(bus, &w);
if (r < 0)
return log_oom();
return log_error_errno(r, "Could not watch jobs: %m");
if (arg_unit) {
r = unit_name_mangle_with_suffix(arg_unit, "as unit",
@@ -1725,7 +1725,7 @@ static int start_transient_trigger(sd_bus *bus, const char *suffix) {
r = bus_wait_for_jobs_new(bus, &w);
if (r < 0)
return log_oom();
return log_error_errno(r, "Could not watch jobs: %m");
if (arg_unit) {
switch (unit_name_to_type(arg_unit)) {

2
src/shared/tests.c
View File

@@ -213,7 +213,7 @@ static int allocate_scope(void) {
r = bus_wait_for_jobs_new(bus, &w);
if (r < 0)
return log_oom();
return log_error_errno(r, "Could not watch jobs: %m");
if (asprintf(&scope, "%s-%" PRIx64 ".scope", program_invocation_short_name, random_u64()) < 0)
return log_oom();