From: Zbigniew Jędrzejewski-Szmek Date: Thu, 20 Oct 2022 08:32:46 +0000 (+0200) Subject: Make comment about coordinating offline and online installation symmetric X-Git-Tag: v252-rc3~4^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ad58fea7303adebf588f8baf34fa84bbb4f036a;p=thirdparty%2Fsystemd.git Make comment about coordinating offline and online installation symmetric https://github.com/systemd/systemd/pull/24728#issuecomment-1260966910 --- diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index a6b3c7b36b9..bdbaa9b58c6 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2133,8 +2133,6 @@ static int send_unit_files_changed(sd_bus *bus, void *userdata) { /* Create an error reply, using the error information from changes[] * if possible, and fall back to generating an error from error code c. * The error message only describes the first error. - * - * Coordinate with install_changes_dump() in install.c. */ static int install_error( sd_bus_error *error, @@ -2146,8 +2144,9 @@ static int install_error( for (size_t i = 0; i < n_changes; i++) - switch (changes[i].type) { + /* When making changes here, make sure to also change install_changes_dump() in install.c. */ + switch (changes[i].type) { case 0 ... _INSTALL_CHANGE_TYPE_MAX: /* not errors */ break; diff --git a/src/shared/install.c b/src/shared/install.c index 53b5aefbe6c..4cc0b67b8b4 100644 --- a/src/shared/install.c +++ b/src/shared/install.c @@ -332,6 +332,8 @@ void install_changes_dump(int r, const char *verb, const InstallChange *changes, for (size_t i = 0; i < n_changes; i++) { assert(verb || changes[i].type >= 0); + /* When making changes here, make sure to also change install_error() in dbus-manager.c. */ + switch (changes[i].type) { case INSTALL_CHANGE_SYMLINK: if (!quiet)