[debian-edu-commits] debian-edu/ 06/07: testsuite/ltsp: Check presence of cert_override.txt in /etc/firefox-esr/, rather than /etc/firefox/.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch jessie
in repository debian-edu-config.

commit f6ad4889b27c455476cb775d06c30ee4929c3dbe
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Jul 7 12:32:19 2016 +0200

    testsuite/ltsp: Check presence of cert_override.txt in /etc/firefox-esr/, rather than /etc/firefox/.
    
    (cherry picked from commit 52266ffa634362bc6b1fb02d7550a1a9a55a2b69)
---
 debian/changelog | 2 ++
 testsuite/ltsp   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8862bb1..6c7b44d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ debian-edu-config (1.818+deb8u2) UNRELEASED; urgency=medium
     of hard-coding /etc/firefox(-esr) several times. Use more quotes.
   * debian/dirs: We ship /etc/firefox-esr, not /etc/firefox.
   * kickoffrc: Use firefox-esr.desktop, rather than firefox.desktop.
+  * testsuite/ltsp: Check presence of cert_override.txt in /etc/firefox-esr/,
+    rather than /etc/firefox/.
 
  -- Holger Levsen <holger at debian.org>  Tue, 31 May 2016 11:23:33 +0200
 
diff --git a/testsuite/ltsp b/testsuite/ltsp
index de7dfbe..6c5c54d 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -59,7 +59,7 @@ if echo "$PROFILE" | grep -q Thin-Client-Server ; then
     fi
 
     for path in /etc/ldap/ssl/ldap-server-pubkey.pem \
-	/etc/firefox/profile/cert_override.txt ; do
+	/etc/firefox-esr/profile/cert_override.txt ; do
 	if cmp -s $path  $chroot$path ; then
 	    success "$path is identical inside and outside LTSP"
 	else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git