Merge pull request #625 from furlongm/hooks

add dnf hook and ensure hook consistency

hooks/apt/05patchman

@@ -1 +1 @@
-DPkg::Post-Invoke      { "if [ -x /usr/sbin/patchman-client ]; then echo 'Sending report to patchman server ...'; /usr/sbin/patchman-client -n ; fi"; };
+DPkg::Post-Invoke { "if [ -x /usr/sbin/patchman-client ] ; then echo 'Sending report to patchman server...' ; /usr/sbin/patchman-client -n ; fi"; };

hooks/dnf/patchman.action

@@ -0,0 +1 @@
+*:any:if [ -x /usr/sbin/patchman-client ] ; then echo 'Sending report to patchman server...' ; /usr/sbin/patchman-client -n ; fi

hooks/yum/patchman.py

@@ -15,15 +15,14 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 import os
-
 from yum.plugins import TYPE_CORE
 
 requires_api_version = '2.1'
 plugin_type = (TYPE_CORE,)
 
 
 def posttrans_hook(conduit):
-    conduit.info(2, 'patchman: sending data')
+    conduit.info(2, 'Sending report to patchman server...')
     servicecmd = conduit.confString('main',
                                     'servicecmd',
                                     '/usr/sbin/patchman-client')

hooks/zypper/patchman.py

@@ -17,7 +17,7 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 #
 # zypp system plugin for patchman
-#
+
 import os
 import logging
 from zypp_plugin import Plugin
@@ -33,7 +33,7 @@ def PLUGINBEGIN(self, headers, body):
     def PACKAGESETCHANGED(self, headers, body):
         logging.info('PACKAGESETCHANGED')
         logging.debug(f'headers: {headers!s}')
-        print('patchman: sending data')
+        print('Sending report to patchman server...')
         servicecmd = '/usr/sbin/patchman-client'
         args = '-n'
         command = f'{servicecmd!s} {args!s}> /dev/null'

setup.cfg

@@ -25,6 +25,7 @@ requires = /usr/bin/python3
     python3-importlib-metadata
     policycoreutils-python-utils
     httpd
+    python3-dnf-plugin-post-transaction-actions
 
 [install]
 optimize=1