/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.prerm

  • Committer: Teddy Hogeborn
  • Date: 2019-03-30 07:03:04 UTC
  • mto: This revision was merged to the branch mainline in revision 382.
  • Revision ID: teddy@recompile.se-20190330070304-dqgch62lsaaygg46
mandos-ctl: Refactor D-Bus operations

* mandos-ctl (dbus): Rename imported module to "dbus_python".
  (main): Only create a bus object and do everything via that object.
  (get_mandos_dbus_object): Remove and move code into dbus or
                            dbus_python_adapter namespaces.
  (if_dbus_exception_log_with_exception_and_exit): - '' -
  (SilenceLogger): - '' -
  (dbus): New; move everything dbus-specific into this module-like
          namespace.
  (dbus_python_adapter): New; move everything specific to the
                         dbus-python D-Bus module into this
                         module-like namespace.
  (command.Base.run): Take only a bus argument; use only that.  Pass
                      "client" argument as a D-Bus object path string,
                      not a dbus-python proxy object.  All derivatives
                      adjusted.
  (command.IsEnabled.is_enabled): Remove.
  (command.Approve, command.Deny, command.Remove,
  command.PropertySetter): Do no logging of D-Bus commands, and use
  only bus, not client, to do D-Bus calls.
  (command.DumpJSON.dbus_boolean_to_bool): Remove; move filtering to
                                           dbus_python_adapter.
  (command.Enable, command.Disable, command.StopChecker,
  command.ApproveByDefault): Use normal Python booleans instead of
  dbus-python's special Boolean types.
  (Unique): New; move here out from inside TestPropertySetterCmd.
  (Test_get_mandos_dbus_object): Remove.
  (Test_get_managed_objects): - '' -
  (Test_dbus_exceptions): New.
  (Test_dbus_MandosBus): - '' -
  (Test_dbus_python_adapter_SystemBus): - '' -
  (Test_dbus_python_adapter_CachingBus): - '' -
  (Test_commands_from_options): Don't create mock client proxy
  objects, define dict of client properties and use a mock dbus to
  verify that the correct D-Bus calls are made.  Also remove any types
  specific to dbus-python.
  (TestEnableCmd, TestDisableCmd, TestStartCheckerCmd,
  TestStopCheckerCmd, TestApproveByDefaultCmd, TestDenyByDefaultCmd):
  Use normal Python booleans instead of dbus-python's special Boolean
  types.
  (TestPropertySetterValueCmd.runTest): Remove; unnecessary.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#! /bin/sh
 
1
#!/bin/sh
2
2
# prerm script for mandos
3
3
#
4
4
# see: dh_installdeb(1)
6
6
set -e
7
7
 
8
8
# summary of how this script can be called:
9
 
#        * <prerm> `remove'
10
 
#        * <old-prerm> `upgrade' <new-version>
11
 
#        * <new-prerm> `failed-upgrade' <old-version>
12
 
#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
13
 
#        * <deconfigured's-prerm> `deconfigure' `in-favour'
14
 
#          <package-being-installed> <version> `removing'
 
9
#        * <prerm> 'remove'
 
10
#        * <old-prerm> 'upgrade' <new-version>
 
11
#        * <new-prerm> 'failed-upgrade' <old-version>
 
12
#        * <conflictor's-prerm> 'remove' 'in-favour' <package> <new-version>
 
13
#        * <deconfigured's-prerm> 'deconfigure' 'in-favour'
 
14
#          <package-being-installed> <version> 'removing'
15
15
#          <conflicting-package> <version>
16
16
# for details, see /usr/share/doc/packaging-manual/
17
17
 
18
18
case "$1" in
19
19
    remove|deconfigure)
20
 
        if [ -x /etc/init.d/mandos ]; then
21
 
                if [ -x /usr/sbin/invoke-rc.d ]; then
22
 
                        invoke-rc.d mandos stop
23
 
                else
24
 
                        /etc/init.d/mandos stop
25
 
                fi
26
 
        fi
 
20
        invoke-rc.d mandos stop || :
27
21
        ;;
28
22
    upgrade|failed-upgrade)
29
23
        ;;
30
24
    *)
31
 
        echo "prerm called with unknown argument \`$1'" >&2
 
25
        echo "prerm called with unknown argument '$1'" >&2
32
26
        exit 0
33
27
    ;;
34
28
esac