/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-client.postrm

  • Committer: Teddy Hogeborn
  • Date: 2014-08-09 13:12:55 UTC
  • mto: (237.7.304 trunk)
  • mto: This revision was merged to the branch mainline in revision 323.
  • Revision ID: teddy@recompile.se-20140809131255-lp31j98u2pl0xpe6
mandos: Stop using str() and remove unnecessary unicode() calls.

* mandos (if_nametoindex): Use "bytes" literal instead of str().
  (initlogger): Use a unicode string for log device.
  (AvahiError.__unicode__): Removed.
  (DBusPropertyException.__unicode__): - '' -
  (ClientDBus.Secret_dbus_property): Use bytes() instead of str().
  (IPv6_TCPServer.server_bind): Use .encode() instead of str().
  (string_to_delta): Removed unnecessary unicode() call.
  (main): Use "isinstance(x, bytes)" instead of "type(x) is str", use
          .decode() instead of unicode(), and use .encode() instead of
          str().

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/mandos-client.postrm
1
 
#!/bin/sh -e
 
1
#!/bin/sh
2
2
# This script can be called in the following ways:
3
3
#
4
4
# After the package was removed:
26
26
# If preinst fails during upgrade:
27
27
#       <new-postrm> abort-upgrade <old-version>
28
28
 
 
29
set -e
29
30
 
30
 
# Update the initramfs
 
31
# Update the initial RAM file system image
31
32
update_initramfs()
32
33
{
33
 
        if which update-initramfs >/dev/null 2>&1; then
34
 
                update-initramfs -u
35
 
        fi
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
 
36
    fi
36
37
}
37
38
 
38
 
 
39
39
case "$1" in
40
40
    remove)
41
41
        update_initramfs
42
42
        ;;
43
43
 
44
44
    purge)
45
 
        shred --remove /etc/keys/mandos/seckey.txt || :
 
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
46
46
        rm --force /etc/mandos/plugin-runner.conf \
47
47
            /etc/keys/mandos/pubkey.txt \
48
 
            /etc/keys/mandos/seckey.txt
49
 
        rmdir /etc/keys/mandos /etc/mandos/plugins.d /etc/mandos || :
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
 
49
        update_initramfs
50
50
        ;;
51
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)
52
52
        ;;
53
53
 
54
54
    *)
55
 
        echo "$0 called with unknown argument \`$1'" 1>&2
 
55
        echo "$0 called with unknown argument '$1'" 1>&2
56
56
        exit 1
57
57
        ;;
58
58
esac