Fix borked merge

Author: cognifloyd

contrib/linux/sensors/file_watch_sensor.py

@@ -446,7 +446,7 @@ def remove_trigger(self, trigger):
         file_path = trigger["parameters"].get("file_path", None)
 
         if not file_path:
-            self.log.error('Received trigger type without "file_path" field.')
+            self.log.error("Received trigger type without 'file_path' field.")
             return
 
         self.tail_manager.stop_tailing_file(file_path, self._handle_line)
@@ -470,7 +470,7 @@ def _handle_line(self, file_path, line):
         self.log.debug(
             f"Sending payload {payload} for trigger {trigger} to sensor_service."
         )
-        self.sensor_service.dispatch(trigger=self.trigger, payload=payload)
+        self.sensor_service.dispatch(trigger=trigger, payload=payload)
 
 
 if __name__ == "__main__":

st2actions/requirements.txt

@@ -13,7 +13,6 @@ gitpython<=3.1.37
 jinja2==2.11.3
 kombu==5.0.2
 lockfile==0.12.2
-logshipper@ git+https://github.com/StackStorm/logshipper.git@stackstorm_patched ; platform_system=="Linux"
 oslo.config>=1.12.1,<1.13
 oslo.utils<5.0,>=4.0.0
 pyparsing<3