clearlinux/systemd-stable
2
0
Fork 0
mirror of https://github.com/clearlinux/systemd-stable.git synced 2026-09-07 14:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

systemctl: return an error code is status fails

Browse Source 
This got lost in the refactoring in f74294c1da.

Also make sure that the return code corresponds to the *first* failure,
not the last.

https://lists.fedoraproject.org/pipermail/devel/2014-May/199080.html
(cherry picked from commit 5bb75bc745)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-06-07 18:36:01 -04:00
parent 1b616bb223
commit 022dcd0d94
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+16 -4
View File
@@ -3824,7 +3824,7 @@ static int show_all(
_cleanup_free_ UnitInfo *unit_infos = NULL;
const UnitInfo *u;
unsigned c;
int r;
int r, ret = 0;
r = get_unit_list(bus, &reply, &unit_infos, NULL);
if (r < 0)
@@ -3846,9 +3846,11 @@ static int show_all(
r = show_one(verb, bus, p, show_properties, new_line, ellipsized);
if (r != 0)
return r;
else if (r > 0 && ret == 0)
ret = r;
}
return 0;
return ret;
}
static int cat(sd_bus *bus, char **args) {
@@ -3993,7 +3995,12 @@ static int show(sd_bus *bus, char **args) {
}
}
show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
r = show_one(args[0], bus, unit, show_properties,
&new_line, &ellipsized);
if (r < 0)
return r;
else if (r > 0 && ret == 0)
ret = r;
}
if (!strv_isempty(patterns)) {
@@ -4010,7 +4017,12 @@ static int show(sd_bus *bus, char **args) {
if (!unit)
return log_oom();
show_one(args[0], bus, unit, show_properties, &new_line, &ellipsized);
r = show_one(args[0], bus, unit, show_properties,
&new_line, &ellipsized);
if (r < 0)
return r;
else if (r > 0 && ret == 0)
ret = r;
}
}
}