Merge pull request #10249 from keszybz/lgtm-fixes

Fixes for issues found by LGTM
2018-10-02 17:42:55 +02:00
parent afc1feaeba 91db8ed5b2
commit eb74d3b97a
7 changed files with 22 additions and 17 deletions
@@ -1896,10 +1896,10 @@ static int install_context_apply(
                if (q < 0)
                        return q;

-                r = install_info_traverse(scope, c, paths, i, flags, NULL);
-                if (r < 0) {
+                q = install_info_traverse(scope, c, paths, i, flags, NULL);
+                if (q < 0) {
                        unit_file_changes_add(changes, n_changes, r, i->name, NULL);
-                        return r;
+                        return q;
                }

                /* We can attempt to process a masked unit when a different unit