[debian-edu-commits] debian-edu/ 01/01: migrate-squid-to-squid3: Add comment; simplify check if both squid and squid3 are installed.

[Wolfgang Schweer]

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

schweer-guest pushed a commit to branch squid-related
in repository debian-edu-config.

commit 60d9f0d80d2f7f1576e030e2503fb0b185541161
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Apr 9 22:46:13 2015 +0200

    migrate-squid-to-squid3: Add comment; simplify check if both squid and squid3 are installed.
---
 share/debian-edu-config/tools/migrate-squid-to-squid3 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/debian-edu-config/tools/migrate-squid-to-squid3 b/share/debian-edu-config/tools/migrate-squid-to-squid3
index 984fcfc..c4dcca1 100755
--- a/share/debian-edu-config/tools/migrate-squid-to-squid3
+++ b/share/debian-edu-config/tools/migrate-squid-to-squid3
@@ -1,6 +1,9 @@
 #!/bin/bash
-
-if [ "$(dpkg -l squid)" != "" ] &&  [ "$(dpkg -l squid3)" != "" ] ; then
+#
+# Takes effect after squid3 has been installed after upgrade from wheezy.
+# The existing cache is reused.
+#
+if [ -f /usr/sbin/squid ] && [ -f /usr/sbin/squid3 ] ; then
     service squid3 stop
     service squid stop
     umount /var/spool/squid

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