From 18943b88d76364e85331414c08bbeeae80fc29a8 Mon Sep 17 00:00:00 2001 From: Andrew Wilcox Date: Sun, 24 Apr 2016 01:45:27 -0500 Subject: Portage integration: Fix blocker issue correctly this time --- apkkit/portage.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apkkit/portage.py b/apkkit/portage.py index d4f065f..e250fe5 100644 --- a/apkkit/portage.py +++ b/apkkit/portage.py @@ -168,6 +168,9 @@ def native(settings, mydbapi=None): op = dep.operator ver = dep.version + if dep.blocker: + package = '!' + package + if op is None and ver is None: # "Easy" dep. params['depends'].append(package) @@ -176,8 +179,6 @@ def native(settings, mydbapi=None): # apk-tools/src/package.c:195 # there is literally no other documentation for this format. apk_format = '{name}{op}{ver}'.format(name=package, op=op, ver=ver) - if dep.blocker is not False: - apk_format = '!' + apk_format params['depends'].append(apk_format) package = Package(**params) -- cgit v1.2.3-70-g09d2