Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "core/dbus: further simplify branch code" #3307

Merged
merged 1 commit into from
May 20, 2016
Merged

Conversation

poettering
Copy link
Member

Reverts #3283

See:

#3283 (comment)

All my fault, I gave a wrong recommendation...

@jonboulle
Copy link
Contributor

agh, should have noticed that. LGTM but will need a follow up for selinux, I can do that..

jonboulle pushed a commit to jonboulle/systemd that referenced this pull request May 20, 2016
free_and_strdup handles NULL but not empty strings.

See also:
systemd#3283 (comment)
systemd#3307
@poettering poettering added this to the v230 milestone May 20, 2016
poettering pushed a commit that referenced this pull request May 20, 2016
free_and_strdup handles NULL but not empty strings.

See also:
#3283 (comment)
#3307
@evverx evverx merged commit 7673628 into master May 20, 2016
@evverx
Copy link
Member

evverx commented May 20, 2016

Test failure seems unrelated. --property User= and friends work fine!

   Loaded: loaded (/run/systemd/transient/run-rc47ec98594cb43c0a68a981c69c23f59.
Transient: yes
   Active: failed (Result: exit-code) since Fri 2016-05-20 20:25:45 UTC; 4min 19
  Process: 302 ExecStart=/bin/sh -c id (code=exited, status=217/USER)
 Main PID: 302 (code=exited, status=217/USER)

disappeared.

@keszybz keszybz deleted the revert-3283-master branch May 21, 2016 20:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

None yet

3 participants