From: Ed Page <eopage@byu.net>
Date: Thu, 31 Mar 2011 03:02:28 +0000 (-0500)
Subject: Improving error handling
X-Git-Url: http://vcs.maemo.org/git/?a=commitdiff_plain;h=b24e4db9f202319170d7d50dba77fa66a273e0e9;p=gc-dialer

Improving error handling
---

diff --git a/src/session.py b/src/session.py
index a50245a..93454a7 100644
--- a/src/session.py
+++ b/src/session.py
@@ -505,13 +505,19 @@ class Session(QtCore.QObject):
 			_moduleLogger.exception("Weirdness loading")
 			return False
 
-		(
-			version, build,
-			contacts, contactUpdateTime,
-			messages, messageUpdateTime,
-			history, historyUpdateTime,
-			dnd, callback
-		) = dumpedData
+		try:
+			(
+				version, build,
+				contacts, contactUpdateTime,
+				messages, messageUpdateTime,
+				history, historyUpdateTime,
+				dnd, callback
+			) = dumpedData
+		except ValueError:
+			_moduleLogger.exception("Upgrade/downgrade fun")
+			return False
+		except:
+			_moduleLogger.exception("Weirdlings")
 
 		if misc_utils.compare_versions(
 			self._OLDEST_COMPATIBLE_FORMAT_VERSION,