/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:
31
31
# Update the initial RAM file system image
32
32
update_initramfs()
33
33
{
34
 
    update-initramfs -u -k all || :
 
34
    if [ -x /usr/sbin/update-initramfs ]; then
 
35
        update-initramfs -u -k all
 
36
    fi
35
37
}
36
38
 
37
39
case "$1" in
43
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
44
46
        rm --force /etc/mandos/plugin-runner.conf \
45
47
            /etc/keys/mandos/pubkey.txt \
46
 
            /etc/keys/mandos/seckey.txt \
47
 
            /etc/keys/mandos/tls-privkey.pem \
48
 
            /etc/keys/mandos/tls-pubkey.pem \
49
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
50
49
        update_initramfs
51
50
        ;;
52
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)