[26444] in Source-Commits
/svn/athena r25577 - trunk/debathena/debathena/kiosk/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Jun 6 16:50:28 2012
Date: Wed, 6 Jun 2012 16:50:27 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201206062050.q56KoRJJ031592@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-06-06 16:50:27 -0400 (Wed, 06 Jun 2012)
New Revision: 25577
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst
Log:
In kiosk:
* Make postinst idempotent (Trac: 770)
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-06-05 21:03:48 UTC (rev 25576)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-06-06 20:50:27 UTC (rev 25577)
@@ -1,3 +1,9 @@
+debathena-kiosk (1.4.6) UNRELEASED; urgency=low
+
+ * Make postinst idempotent (Trac: 770)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 06 Jun 2012 16:50:22 -0400
+
debathena-kiosk (1.4.5) unstable; urgency=low
* Terminate kiosk sessions after 15 minutes. Patch from Luke Faraone
Modified: trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst
===================================================================
--- trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst 2012-06-05 21:03:48 UTC (rev 25576)
+++ trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst 2012-06-06 20:50:27 UTC (rev 25577)
@@ -27,7 +27,8 @@
fi
# In the new gdm, the launcher is invoked as user gdm.
gdm_version="$(dpkg-query -W -f '${Version}' gdm)"
- if dpkg --compare-versions "$gdm_version" ge '2.25.2~'; then
+ if dpkg --compare-versions "$gdm_version" ge '2.25.2~' &&
+ [ "$(perl -e 'BEGIN { $found=0; } $found = 1 if /^### BEGIN debathena-kiosk/../^### END debathena-kiosk/; END { print $found; }' /etc/sudoers)" = "0" ]; then
cat >>/etc/sudoers <<EOF
### BEGIN debathena-kiosk
# gdm can launch kiosk mode
