summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-08-06 02:58:46 +0200
committerLennart Poettering <lennart@poettering.net>2010-08-06 02:58:46 +0200
commit2e81c8a55785d33e48c6d512e094a3a7dd0bf900 (patch)
treec0d8eadc635961820d11fc09bf85e80888d6442a
parent75d287d3aef51baac189395d0ca6e2271ba4d604 (diff)
manager: downgrade a few log msgs regarding conflicting but fixable jobs
-rw-r--r--fixme4
-rw-r--r--src/manager.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/fixme b/fixme
index f459f82996..4601c7202f 100644
--- a/fixme
+++ b/fixme
@@ -61,11 +61,9 @@
* if a service fails too often, make the service enter maintainence mode, and the socket, too.
-* keine meldung by wants vs. conflicts
-
* send cgroup msg directly
-* fix graphical vs getty@tty1 output
+* don't show file not found msgs for irrelevant units
External:
diff --git a/src/manager.c b/src/manager.c
index cc12d6bf22..9b6cbc94e0 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -746,7 +746,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) {
return -ENOEXEC;
/* Ok, we can drop one, so let's do so. */
- log_notice("Trying to fix job merging by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type));
+ log_debug("Fixing conflicting jobs by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type));
transaction_delete_job(m, d, true);
return 0;
}
@@ -1309,7 +1309,7 @@ void manager_transaction_unlink_job(Manager *m, Job *j, bool delete_dependencies
job_dependency_free(j->object_list);
if (other && delete_dependencies) {
- log_info("Deleting job %s/%s as dependency of job %s/%s",
+ log_debug("Deleting job %s/%s as dependency of job %s/%s",
other->unit->meta.id, job_type_to_string(other->type),
j->unit->meta.id, job_type_to_string(j->type));
transaction_delete_job(m, other, delete_dependencies);