/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-07-25 23:16:04 UTC
  • mto: (237.7.272 trunk)
  • mto: This revision was merged to the branch mainline in revision 321.
  • Revision ID: teddy@recompile.se-20140725231604-f5c4f82rn2o5ll1k
Use the .items() method instead of .iteritems().

This is strictly not a Python 2.7 change, but Python 2.7 backported
the new .viewitems() from Python 3, and instead of changing .items()
to .viewitems() and later having to change them all into .items()
again in Python 3, I opted to just change all .iteritems() to .items()
so the code will work both now and with Python 3.  The slowdown with
Python 2 is not significant, and with Python 3 it will again be fast.

* mandos (Client.__init__): Use .items() instead of .iteritems().
  (DBusObjectWithProperties.Introspect): - '' -
  (alternate_dbus_interfaces/wrapper): - '' -
  (main): - '' -
* mandos-ctl (main): - '' -

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 1>&2
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" 1>&2
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
 
50
42
        ;;
51
43
 
52
44
    purge)
53
 
        shred --remove /etc/keys/mandos/seckey.txt \
54
 
            /etc/keys/mandos/tls-privkey.pem 2>/dev/null || :
 
45
        shred --remove /etc/keys/mandos/seckey.txt 2>/dev/null || :
55
46
        rm --force /etc/mandos/plugin-runner.conf \
56
47
            /etc/keys/mandos/pubkey.txt \
57
 
            /etc/keys/mandos/seckey.txt \
58
 
            /etc/keys/mandos/tls-privkey.pem \
59
 
            /etc/keys/mandos/tls-pubkey.pem \
60
 
            /etc/keys/mandos/dhparams.pem 2>/dev/null
 
48
            /etc/keys/mandos/seckey.txt 2>/dev/null
61
49
        update_initramfs
62
50
        ;;
63
51
    upgrade|failed-upgrade|disappear|abort-install|abort-upgrade)