[27050] in Source-Commits
/svn/athena r25914 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Thu Apr 11 13:16:54 2013
Date: Thu, 11 Apr 2013 13:16:47 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304111716.r3BHGls6010717@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-11 13:16:46 -0400 (Thu, 11 Apr 2013)
New Revision: 25914
Modified:
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh
Log:
In xsession:
* Don't attempt to remove the lightdm dmrc cache, because we can't.
* Explain why we don't care about the lightdm dmrc cache anyway
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2013-04-10 18:35:20 UTC (rev 25913)
+++ trunk/debathena/debathena/xsession/debian/changelog 2013-04-11 17:16:46 UTC (rev 25914)
@@ -1,10 +1,12 @@
-debathena-xsession (1.20) UNRELEASED; urgency=low
+debathena-xsession (1.20) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Don't attempt to remove the lightdm dmrc cache, because we can't.
+ * Explain why we don't care about the lightdm dmrc cache anyway
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:31:26 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Thu, 11 Apr 2013 13:16:30 -0400
debathena-xsession (1.19) unstable; urgency=low
Modified: trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh 2013-04-10 18:35:20 UTC (rev 25913)
+++ trunk/debathena/debathena/xsession/debian/debathena-nocalls.sh 2013-04-11 17:16:46 UTC (rev 25914)
@@ -7,9 +7,12 @@
fi
# You don't actually want nocalls as your default session
+# We don't remove it from the lightdm cache because we can't actually
+# read the lightdm cache. But with our lightdm-greeter, an incorrect
+# value will never get cached anyway (because we always pass a session
+# name, so the cache is not consulted)
DMRCFILES="$HOME/.dmrc \
- /var/cache/gdm/$USER/dmrc \
- /var/cache/lightdm/dmrc/$USER.dmrc"
+ /var/cache/gdm/$USER/dmrc"
for f in $DMRCFILES; do
[ -e "$f" ] && \
