/mandos/trunk

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

« 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
  • 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
31
31
# Update the initial RAM file system image
32
32
update_initramfs()
33
33
{
34
 
    if command -v update-initramfs >/dev/null; then
35
 
        update-initramfs -k all -u
36
 
    elif command -v dracut >/dev/null; then
37
 
        # Logic taken from dracut.postinst
38
 
        for kernel in /boot/vmlinu[xz]-*; do
39
 
            kversion="${kernel#/boot/vmlinu[xz]-}"
40
 
            if [ "$kversion" != "*" ]; then
41
 
                /etc/kernel/postinst.d/dracut "$kversion"
42
 
            fi
43
 
        done
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
44
36
    fi
45
37
}
46
38
 
53
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
54
46
        rm --force /etc/mandos/plugin-runner.conf \
55
47
            /etc/keys/mandos/pubkey.txt \
56
 
            /etc/keys/mandos/seckey.txt \
57
 
            /etc/keys/mandos/tls-privkey.pem \
58
 
            /etc/keys/mandos/tls-pubkey.pem \
59
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
60
49
        update_initramfs
61
50
        ;;
62
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)