Nux

Merge lp://staging/~3v1n0/nux/x11-conffile-on-unity-only-x into lp://staging/nux/xenial

Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Iain Lane
Approved revision: 885
Merge reported by: Marco Trevisan (Treviño)
Merged at revision: not available
Proposed branch: lp://staging/~3v1n0/nux/x11-conffile-on-unity-only-x
Merge into: lp://staging/nux/xenial
Diff against target: 41 lines (+23/-2)
2 files modified
debian/50_check_unity_support (+14/-2)
debian/changelog (+9/-0)
To merge this branch: bzr merge lp://staging/~3v1n0/nux/x11-conffile-on-unity-only-x
Reviewer Review Type Date Requested Status
Iain Lane (community) Approve
Review via email: mp+347864@code.staging.launchpad.net

Commit message

X11-check-unity-support: only run when called from an unity session

The content of $XDG_CURRENT_DESKTOP is checked inside a sub-shell
not to affect the value of IFS for all the scripts sourced by the X session.

If running in Unity we should call unity_support_test, not inside gnome
ubuntu X sessions.

XDG_CURRENT_DESKTOP values are currently the followings:
 - unity before 17.10: Unity
 - unity after 17.10: Unity:Unity7:ubuntu
 - gnome session: GNOME
 - ubuntu gnome session: ubuntu:GNOME

To post a comment you must log in.
885. By Marco Trevisan (Treviño)

Revert: "debian: don't consider the Xsession.d script as a config file anymore"

It seems something there's not full agreement on it, so to avoid further discussions
I'm reverting this back. However I strongly believe that given the current tools we have
this is the way to go, as debian doesn't provide other tools to get this done.
Nor X11 can move files outside of /etc.

Revision history for this message
Iain Lane (laney) wrote :

cheers

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches