← Back to branch summary

~ubuntu-branches/ubuntu/trusty/xdm/trusty

« back to all changes in this revision

Viewing changes to config/Xsession.cpp

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2011-12-09 03:00:26 UTC
  • mfrom: (9.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20111209030026-baa9vul2hhtujjxh
Tags: 1:1.1.11-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.

* Drop debian/patches/ftbfs_binutils-gold.diff: Fixed upstream
* Change Vcs-* to XS-Debian-Vcs-*
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Xsession.cpp
10
10
else
11
11
#ifdef MKTEMP_COMMAND
12
12
        mktemp=MKTEMP_COMMAND
13
 
        for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
 
13
        for errfile in "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
14
14
        do
15
15
                if ef="$( umask 077 && $mktemp "$errfile.XXXXXX" 2> /dev/null)"
16
16
                then
17
17
                        exec > "$ef" 2>&1
18
18
                        mv "$ef" "$errfile" 2> /dev/null
19
 
                        break
20
 
                fi
 
19
                        break
 
20
                fi
21
21
        done
22
22
#else
23
23
XCOMM Since this system doesn't have a mktemp command to allow secure