From cb6906fa6749e641cbb7b49875cebde78d54bc7c Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Wed, 13 Jul 2011 11:51:15 +0000
Subject: [PATCH] [LMS-2332] bugfix
SVN: 22116
---
.../dropbox-all-in-one-with-library.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py b/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
index 46cbb1c6e84..d6f3af0c86a 100644
--- a/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
+++ b/sanofi/dist/etc/sanofi-dropbox/dropbox-all-in-one-with-library.py
@@ -85,7 +85,6 @@ def getAdminEmails():
def rollback_service(service, ex):
-
if isUserError(ex):
shortErrorMessage = ex.getMessage()
if not shortErrorMessage:
@@ -144,7 +143,6 @@ def sendAdminError(service, errorDetails, recipients):
""" % vars(), recipients)
def sendSystemErrorNotificationToUser(service, recipients):
-
incomingFileName = incoming.getName()
sendEmail("openBIS: Data registration failed for folder '%s'" % (incomingFileName), """
@@ -187,6 +185,11 @@ def getDefaultEmailRecipients():
if recipientsProp:
recipients = [ email.strip() for email in recipientsProp.split(",") ]
+ return recipients
+
+def sendEmail(title, content, recipients):
+ global experiment
+
if not recipients:
if experiment:
experimentMsg = ("Please, fill in e-mail recipients list in the property '%s' of experiment '%s'." % (EXPERIMENT_RECIPIENTS_PROPCODE, experiment.getExperimentIdentifier()))
@@ -197,12 +200,8 @@ def getDefaultEmailRecipients():
"\nEmail title: %s"
"\nEmail content: %s" %
(incoming.getName(), experimentMsg, title, content))
-
- return recipients
-
-def sendEmail(title, content, recipients):
- if not recipients:
return
+
fromAddress = From("openbis@sanofi-aventis.com")
replyTo = None
state.mailClient.sendMessage(title, content, replyTo, fromAddress, recipients)
--
GitLab