From 07e0ad2ba1c664484b771f5e62fa9a53b3993b37 Mon Sep 17 00:00:00 2001 From: pydanny Date: Mon, 14 Mar 2011 11:03:58 -0400 Subject: [PATCH] Some tweaks of this bit of code --- apps/package/handlers/launchpad.py | 5 ++++- apps/package/management/commands/package_updater.py | 4 ++++ requirements/project.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/package/handlers/launchpad.py b/apps/package/handlers/launchpad.py index 5d0b7ac..5e1baed 100644 --- a/apps/package/handlers/launchpad.py +++ b/apps/package/handlers/launchpad.py @@ -6,11 +6,14 @@ def pull(package): + cachedir = getattr(settings, 'LAUNCHPAD_CACHE_DIR', os.path.join(settings.PROJECT_ROOT, 'lp-cache')) launchpad = Launchpad.login_anonymously('djangopackages.com', 'production', cachedir) - repo_name = package.repo_name() + repo_name = package.repo_name().replace('https://code.launchpad.net/','') + branch = launchpad.branches.getByUrl(url='lp:%s' % repo_name) + package.repo_description = branch.description or '' package.repo_forks = len(branch.project.getBranches()) package.repo_watchers = len(branch.subscribers) diff --git a/apps/package/management/commands/package_updater.py b/apps/package/management/commands/package_updater.py index 6f4018c..d2b7720 100644 --- a/apps/package/management/commands/package_updater.py +++ b/apps/package/management/commands/package_updater.py @@ -81,6 +81,10 @@ def handle(self, *args, **options): message = "For '%s', too many requests issued to repo threw a RuntimeError: %s" % (package.title, e) print >> stdout, message continue + except UnicodeDecodeError, e: + message = "For '%s', UnicodeDecodeError: %s" % (package.title, e) + print >> stdout, message + continue if not authed: sleep(zzz) diff --git a/requirements/project.txt b/requirements/project.txt index 3f41c44..2076920 100644 --- a/requirements/project.txt +++ b/requirements/project.txt @@ -13,4 +13,4 @@ python-dateutil==1.5 django-reversion==1.3.1 django-sorting==0.1 bzr==2.3.1 -launchpadlib==1.9.8 +launchpadlib==1.9.8 \ No newline at end of file