From 1fdf117a522c5a686bbd03c6869b56805ee08efd Mon Sep 17 00:00:00 2001 From: Remy Date: Thu, 14 Jul 2011 02:36:30 -0700 Subject: [PATCH] Fixed updater (hopefully), and some other small bugs --- headphones/__init__.py | 7 +++++-- headphones/versioncheck.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/headphones/__init__.py b/headphones/__init__.py index 5a6796d1..292bd8fa 100644 --- a/headphones/__init__.py +++ b/headphones/__init__.py @@ -373,8 +373,11 @@ def shutdown(restart=False, update=False): config_write() if update: - versioncheck.update() - + try: + versioncheck.update() + except Exception, e: + logger.warn('Headphones failed to update: %s. Restarting.' % e) + if restart: popen_list = [sys.executable, FULL_PATH] diff --git a/headphones/versioncheck.py b/headphones/versioncheck.py index 0e10be28..b651227a 100644 --- a/headphones/versioncheck.py +++ b/headphones/versioncheck.py @@ -89,7 +89,7 @@ def checkGithub(): def update(): - output, err = runGit('pull origin '+headphones.LATEST_VERSION) + output, err = runGit('pull origin master') if not output: logger.error('Couldn\'t download latest version')