/mandos/release

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/release

« back to all changes in this revision

Viewing changes to debian/mandos.postinst

  • Committer: Teddy Hogeborn
  • Date: 2016-03-12 20:23:15 UTC
  • mto: (237.7.594 trunk)
  • mto: This revision was merged to the branch mainline in revision 339.
  • Revision ID: teddy@recompile.se-20160312202315-hu7b87ivetlxqbw3
Server: Fix minor thing with Python 3 compatibility

Fix another small thing with unpickling string values.

* mandos (main): When restoring pickled client data, only decode byte
                 string for "host" key if it really is a byte string.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos.postinst
34
34
                --home /nonexistent --no-create-home --group \
35
35
                --disabled-password --gecos "Mandos password system" \
36
36
                _mandos
 
37
        elif dpkg --compare-versions "$2" eq 1.7.4-1 \
 
38
                || dpkg --compare-versions "$2" eq "1.7.4-1~bpo8+1"
 
39
        then
 
40
            start=no
 
41
            if ! [ -f /var/lib/mandos/clients.pickle ]; then
 
42
                invoke-rc.d mandos stop
 
43
                start=yes
 
44
            fi
 
45
            chown _mandos:_mandos /var/lib/mandos/clients.pickle \
 
46
                  2>/dev/null || :
 
47
            if [ "$start" = yes ]; then
 
48
                invoke-rc.d mandos start
 
49
            fi
37
50
        fi
 
51
        chown _mandos:_mandos /var/lib/mandos
38
52
        ;;
39
 
 
 
53
    
40
54
    abort-upgrade|abort-deconfigure|abort-remove)
41
55
        ;;
42
 
 
 
56
    
43
57
    *)
44
58
        echo "$0 called with unknown argument '$1'" 1>&2
45
59
        exit 1
46
60
        ;;
47
61
esac
48
62
 
 
63
# Avahi version 0.6.31-2 and older provides "avahi" (instead of
 
64
# "avahi-daemon") in its /etc/init.d script header.  To make
 
65
# insserv(8) happy, we edit our /etc/init.d script header to contain
 
66
# the correct string before the code added by dh_installinit calls
 
67
# update.rc-d, which calls insserv.
 
68
avahi_version="`dpkg-query --showformat='${Version}' --show avahi-daemon`"
 
69
if dpkg --compare-versions "$avahi_version" le 0.6.31-2; then
 
70
    sed --in-place --expression='/^### BEGIN INIT INFO$/,/^### END INIT INFO$/s/^\(# Required-\(Stop\|Start\):.*avahi\)-daemon\>/\1/g' /etc/init.d/mandos
 
71
fi
 
72
 
49
73
#DEBHELPER#
50
74
 
51
75
exit 0