From aab53d3b4456ac4190c6b8482998f86b5ddef9bb Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 26 Mar 2008 13:12:21 +0100 Subject: (Finally) Fixed new_version; Better log strings in plugins to differentiate them from the normal portato logs --- portato/plugins/new_version.py | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'portato/plugins/new_version.py') diff --git a/portato/plugins/new_version.py b/portato/plugins/new_version.py index 47f6719..687e107 100644 --- a/portato/plugins/new_version.py +++ b/portato/plugins/new_version.py @@ -7,23 +7,31 @@ from threading import Thread import gobject -from portato.helper import debug, _ +from portato.helper import debug, warning from portato import get_listener from portato.constants import VERSION, APP_ICON, APP def find_thread (rev): - b = branch.Branch.open("lp:portato") - - debug("Installed rev: %s - Current rev: %s", rev, b.revno()) + try: + b = branch.Branch.open("lp:portato") + except Exception, e: + warning("NEW_VERSION :: Exception occured while accessing the remote branch: %s", str(e)) + return + + debug("NEW_VERSION :: Installed rev: %s - Current rev: %s", rev, b.revno()) if int(rev) < int(b.revno()): - gobject.idle_add(get_listener().send_notify, base = "New Portato Live Version Found", descr = "You have rev. %s, but the most recent revision is %s." % (rev, b.revno()), icon = APP_ICON) + def callback(): + get_listener().send_notify(base = "New Portato Live Version Found", descr = "You have rev. %s, but the most recent revision is %s." % (rev, b.revno()), icon = APP_ICON) + return False + + gobject.idle_add(callback) def find_version (*args, **kwargs): if not all((plugin, branch)): return v = VERSION.split() - if len(v) != 3 and v[0] != "9999": + if len(v) != 3 or v[0] != "9999": return rev = v[-1] -- cgit v1.2.3-54-g00ecf