From 1d2d44b9162a9bcddc1a3b642c6f5038095b72c8 Mon Sep 17 00:00:00 2001 From: René 'Necoro' Neumann Date: Wed, 9 Apr 2008 01:22:15 +0200 Subject: Do something useful if an assertionerror is thrown during dep-resolution --- portato/gui/windows/main.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'portato/gui') diff --git a/portato/gui/windows/main.py b/portato/gui/windows/main.py index cde7461..14a0181 100644 --- a/portato/gui/windows/main.py +++ b/portato/gui/windows/main.py @@ -193,7 +193,7 @@ class PackageTable: ftexts = [] for count, t in enumerate(texts): - if not t.startswith(("http:", "ftp:")): + if not t.startswith(("http", "ftp")): if count == 0: error(_("The first homepage part does not start with 'http' or 'ftp'.")) ftexts.append(t) @@ -225,9 +225,8 @@ class PackageTable: def fill_dep_list(self): - deptree = self.actual_package().get_dependencies() store = self.depList.get_model() - + def add (tree, it): def get_icon (dep): @@ -274,8 +273,15 @@ class PackageTable: ndeps.sort(key = sort_key) for dep in ndeps: store.append(it, [get_icon(dep), dep.dep]) - - add (deptree, None) + + try: + deptree = self.actual_package().get_dependencies() + except AssertionError: + w = _("Can't display dependencies: This package has an unsupported dependency string.") + error(w) + store.append(None, [None, w]) + else: + add(deptree, None) def fill_use_list(self): -- cgit v1.2.3-54-g00ecf