Merge lp:~seb128/lightdm/xenial-guest-session into lp:lightdm

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 2240
Proposed branch: lp:~seb128/lightdm/xenial-guest-session
Merge into: lp:lightdm
Diff against target: 11 lines (+3/-1)
1 file modified
debian/guest-session-setup.sh (+3/-1)
To merge this branch: bzr merge lp:~seb128/lightdm/xenial-guest-session
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Laércio de Sousa (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+277371@code.launchpad.net

Commit message

[guest] Don't error out if there is no prefs.sh configuration

Description of the change

[guest] Don't error out if there is no prefs.sh configuration

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Laércio de Sousa (lbssousa) wrote :

Agreed.

review: Approve
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/guest-session-setup.sh'
2--- debian/guest-session-setup.sh 2015-10-15 12:23:40 +0000
3+++ debian/guest-session-setup.sh 2015-11-12 17:26:38 +0000
4@@ -31,4 +31,6 @@
5 #/bin/echo -e ${dmrc} > ${HOME}/.dmrc
6
7 # set possible local guest session preferences
8-[ -f ${site_gs}/prefs.sh ] && . ${site_gs}/prefs.sh
9+if [ -f ${site_gs}/prefs.sh ]; then
10+ . ${site_gs}/prefs.sh
11+fi

Subscribers

People subscribed via source and target branches