From 1d55be86b29d7e4b96102d8607258af260aaaa09 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Mon, 18 Nov 2013 13:49:41 +0530
Subject: [PATCH] [minor] [fix] dropbox

---
 setup/doctype/backup_manager/backup_dropbox.py | 7 +++++--
 setup/doctype/backup_manager/backup_manager.py | 4 ++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/setup/doctype/backup_manager/backup_dropbox.py b/setup/doctype/backup_manager/backup_dropbox.py
index 3d3f428260..8190fcb4a5 100644
--- a/setup/doctype/backup_manager/backup_dropbox.py
+++ b/setup/doctype/backup_manager/backup_dropbox.py
@@ -64,6 +64,9 @@ def dropbox_callback(oauth_token=None, not_approved=False):
 	webnotes.local.message_title = "Dropbox Approval"
 	webnotes.local.message = "<h3>%s</h3><p>Please close this window.</p>" % message
 	
+	if allowed:
+		webnotes.local.message_success = True
+	
 	webnotes.conn.commit()
 	webnotes.response['type'] = 'page'
 	webnotes.response['page_name'] = 'message.html'
@@ -109,9 +112,9 @@ def backup_to_dropbox():
 		if not found:
 			try:
 				upload_file_to_dropbox(filepath, "/files", dropbox_client)
-			except Exception, e:
+			except Exception:
 				did_not_upload.append(filename)
-				error_log.append(cstr(e))
+				error_log.append(webnotes.getTraceback())
 	
 	webnotes.connect()
 	return did_not_upload, list(set(error_log))
diff --git a/setup/doctype/backup_manager/backup_manager.py b/setup/doctype/backup_manager/backup_manager.py
index aaf17f5ffa..e00fe9adb0 100644
--- a/setup/doctype/backup_manager/backup_manager.py
+++ b/setup/doctype/backup_manager/backup_manager.py
@@ -39,6 +39,10 @@ def take_backups_dropbox():
 		file_and_error = [" - ".join(f) for f in zip(did_not_upload, error_log)]
 		error_message = ("\n".join(file_and_error) + "\n" + webnotes.getTraceback())
 		webnotes.errprint(error_message)
+		
+		if not webnotes.conn:
+			webnotes.connect()
+			
 		send_email(False, "Dropbox", error_message)
 
 #backup to gdrive