summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--portato/backend/portage/package.py6
-rw-r--r--portato/gui/gtk/basic.py7
-rw-r--r--setup.py2
3 files changed, 8 insertions, 7 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index 38dcb4b..e5e5603 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -19,7 +19,6 @@ from ..exceptions import BlockedException, PackageNotFoundException
from ...helper import debug, unique_array
import portage, portage_dep
-from portage_util import unique_array
import os.path
from gettext import lgettext as _
@@ -216,15 +215,16 @@ class PortagePackage (Package):
raise PackageNotFoundException, dep
list = system.sort_package_list(list)
+ list.reverse()
done = False
- for i in range(len(list)-1,0,-1):
+ for i in range(len(list)):
p = list[i]
if not p.is_masked():
dep_pkgs.append(create_dep_pkgs_data(dep, p))
done = True
break
if not done:
- dep_pkgs.append(create_dep_pkgs_data(dep, list[-1]))
+ dep_pkgs.append(create_dep_pkgs_data(dep, list[0]))
else:
dep_pkgs.append(create_dep_pkgs_data(dep, pkg))
diff --git a/portato/gui/gtk/basic.py b/portato/gui/gtk/basic.py
index bc96c97..3737607 100644
--- a/portato/gui/gtk/basic.py
+++ b/portato/gui/gtk/basic.py
@@ -17,6 +17,8 @@ import gtk
import gtk.glade
import gobject
+from functools import wraps
+
from ...constants import DATA_DIR, APP_ICON, APP, LOCALE_DIR
gtk.glade.bindtextdomain (APP, LOCALE_DIR)
@@ -34,6 +36,8 @@ class Window (object):
def watch_cursor (func):
"""This is a decorator for functions being so time consuming, that it is appropriate to show the watch-cursor.
@attention: this function relies on the gtk.Window-Object being stored as self.window"""
+
+ @wraps(func)
def wrapper (self, *args, **kwargs):
ret = None
def cb_idle():
@@ -48,9 +52,6 @@ class Window (object):
gobject.idle_add(cb_idle)
return ret
- wrapper.__dict__ = func.__dict__
- wrapper.__name__ = func.__name__
- wrapper.__doc__ = func.__doc__
return wrapper
def get_tree (self, name):
diff --git a/setup.py b/setup.py
index ca9ae4d..ec07966 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,7 @@ setup(name="Portato",
version = VERSION,
description = "Frontends to Portage",
license = "GPLv2",
- url = "http://portato.sourceforge.net/",
+ url = "http://portato.origo.ethz.ch/",
author = "René 'Necoro' Neumann",
author_email = "necoro@necoro.net",
packages = packages,