summaryrefslogtreecommitdiff
path: root/portato
diff options
context:
space:
mode:
authorRené 'Necoro' Neumann <necoro@necoro.net>2008-06-08 13:22:16 +0200
committerRené 'Necoro' Neumann <necoro@necoro.net>2008-06-08 13:22:16 +0200
commit6abef376977971e20b83e327f40cc1ea5473fba7 (patch)
treec595ef9cf61bda9dc9951482f1b59d2aaf011374 /portato
parent9ae32f058d2c9c7781ab6ddd2d78bb412d8a3095 (diff)
downloadportato-6abef376977971e20b83e327f40cc1ea5473fba7.tar.gz
portato-6abef376977971e20b83e327f40cc1ea5473fba7.tar.bz2
portato-6abef376977971e20b83e327f40cc1ea5473fba7.zip
Do not block the same slot - as clears itself
Diffstat (limited to '')
-rw-r--r--portato/backend/portage/package.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index 63cec93..424945e 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -235,9 +235,9 @@ class PortagePackage (Package):
for dep in deps:
if dep[0] == '!': # blocking sth
dep = dep[1:]
- if dep != self.get_cp(): # not cpv, because a version might explicitly block another one
- blocked = system.find_installed_packages(dep)
- if blocked != []:
+ blocked = system.find_installed_packages(dep)
+ if blocked:
+ if blocked[0].get_slot_cp() != self.get_slot_cp(): # blocks in the same slot are harmless
raise BlockedException, (self.get_cpv(), blocked[0].get_cpv())
continue # finished with the blocking one -> next