Merge lp:~ryan-c-ahearn/backintime/callback_exit_feature into lp:backintime/1.0

[Ryan Ahearn]

[Ryan Ahearn (ryan-c-ahearn)]

This change in usercallbackscript.py outputs the stdout and stderr of user.callback into syslog and will exit the backup if user.callback returns a non-0 exit code.

=== modified file 'plugins/usercallbackplugin.py'
--- plugins/usercallbackplugin.py	2009-05-26 10:03:17 +0000
+++ plugins/usercallbackplugin.py	2009-09-07 18:13:23 +0000
@@ -22,6 +22,8 @@
 import tools
 import logger
 import gettext
+from subprocess import Popen
+from subprocess import PIPE
 
 _=gettext.gettext
 
@@ -39,7 +41,17 @@
 
 	def notify_callback( self, args = '' ):
 		logger.info( "[UserCallbackPlugin.notify_callback] %s" % args )
-		os.system( "sh \"%s\" %s" % ( self.callback, args ) )
+		try:
+			callback = Popen( "\"%s\" %s" % ( self.callback, args ), shell=True, stdout=PIPE, stderr=PIPE )
+			output = callback.communicate()
+			if output[0]:
+				logger.info( "[UserCallbackPlugin.notify_callback callback output] %s" % output[0] )
+			if output[1]:
+				logger.error( "[UserCallbackPlugin.notify_callback callback error] %s" % output[1] )
+			if callback.returncode != 0:
+				exit()
+		except OSError:
+			logger.error( "[UserCallbackPlugin.notify_callback] Exception when trying to run user callback" )
 
 	def on_process_begins( self ):
 		self.notify_callback( '1' )