picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

manager: properly return newly created job in transaction_add_job_and_dependencies()

Browse source
This commit is contained in:
Lennart Poettering 2010-02-12 02:21:08 +01:00
parent 0262225c0c
commit c0dafa4853
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manager.c
View file

@ -901,6 +901,9 @@ static int transaction_add_job_and_dependencies(Manager *m, JobType type, Unit *
/* JOB_VERIFY_STARTED, JOB_RELOAD require no dependency handling */
}
if (_ret)
*_ret = ret;
return 0;
fail:
@ -918,7 +921,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
log_debug("Trying to enqueue job %s/%s", unit_id(unit), job_type_to_string(type));
if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret))) {
if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, force, &ret)) < 0) {
transaction_abort(m);
return r;
}
@ -926,7 +929,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool for
if ((r = transaction_activate(m, mode)) < 0)
return r;
log_debug("Enqueued job %s/%s", unit_id(unit), job_type_to_string(type));
log_debug("Enqueued job %s/%s as %u", unit_id(unit), job_type_to_string(type), (unsigned) ret->id);
if (_ret)
*_ret = ret;

2
test1/syslog.socket
View file

@ -5,4 +5,4 @@ Description=Syslog Socket
ListenDatagram=/tmp/foobar/waldo/systemd-syslog-socket
ListenStream=eth0:3456
DirectoryMode=0700
SocketMode=0400
SocketMode=0600