summaryrefslogtreecommitdiff
path: root/debian/preinst
diff options
context:
space:
mode:
Diffstat (limited to 'debian/preinst')
-rw-r--r--debian/preinst6
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/preinst b/debian/preinst
index 320d4df2a..e22d0aa5d 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -3,11 +3,11 @@
3action=$1 3action=$1
4version=$2 4version=$2
5 5
6if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then 6if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
7 version=1.2.27 7 version=1.2.27
8fi 8fi
9 9
10if [ "$action" = upgrade -o "$action" = install ] 10if [ "$action" = upgrade ] || [ "$action" = install ]
11then 11then
12 # check if debconf is missing 12 # check if debconf is missing
13 if ! test -f /usr/share/debconf/confmodule 13 if ! test -f /usr/share/debconf/confmodule
@@ -39,7 +39,7 @@ EOF
39 # work around for missing debconf 39 # work around for missing debconf
40 db_get() { : ; } 40 db_get() { : ; }
41 RET=true 41 RET=true
42 if [ -d /etc/ssh-nonfree -a ! -d /etc/ssh ]; then 42 if [ -d /etc/ssh-nonfree ] && [ ! -d /etc/ssh ]; then
43 cp -a /etc/ssh-nonfree /etc/ssh 43 cp -a /etc/ssh-nonfree /etc/ssh
44 fi 44 fi
45 else 45 else