From d89a5d18378a79b4f9fb6b6738f2a5e008539a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 23 Apr 2010 00:43:40 +0200 Subject: Small error in sqldb --- portato/db/sql.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'portato') diff --git a/portato/db/sql.py b/portato/db/sql.py index 581ebc4..2de2795 100644 --- a/portato/db/sql.py +++ b/portato/db/sql.py @@ -263,7 +263,7 @@ class SQLDatabase (Database): if self._type & self.SEARCH_NAME: if "/" in restrict: - rest = "(name LIKE '%s%%' AND cat LIKE '%s')" % (pkg, cat) + rest = "(name LIKE '%s%%' AND cat LIKE '%s')" % restrict.split("/",1) else: rest = "(name LIKE '%%%(restrict)s%%' OR cat LIKE '%(restrict)s%%')" % {"restrict":restrict} -- cgit v1.2.3 From ad22f8ddd205c8110ffa5b2dae4f5d1fc2c21e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 23 Apr 2010 00:58:06 +0200 Subject: Reset HOME to /root for root --- portato/constants.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'portato') diff --git a/portato/constants.py b/portato/constants.py index a8e930c..059017e 100644 --- a/portato/constants.py +++ b/portato/constants.py @@ -50,6 +50,10 @@ These should be set during the installation. import os from os.path import join as pjoin +# ktsuss does not reset this correctly +if os.getuid() == 0: + os.environ["HOME"] = "/root" + # icons ICON_DIR = "icons/" APP_ICON = pjoin(ICON_DIR, "portato-icon.png") -- cgit v1.2.3 From 41dba09a8be14c85403bc9ea59001c2528e4f0cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= Date: Fri, 23 Apr 2010 01:00:55 +0200 Subject: Clearer debug message for packages not in mergequeue --- portato/gui/queue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'portato') diff --git a/portato/gui/queue.py b/portato/gui/queue.py index b18e4e7..f5b608a 100644 --- a/portato/gui/queue.py +++ b/portato/gui/queue.py @@ -637,7 +637,7 @@ class EmergeQueue: try: self.oneshotmerge.remove(cpv) except ValueError: - debug("Catched ValueError => %s seems not to be in merge-queue. Should be no harm.", cpv) + debug("Catched ValueError => %s seems not to be in merge-queue. This probably means it is a dependency.", cpv) elif self.tree.is_in_unmerge(it): # in Unmerge try: -- cgit v1.2.3