diff options
| author | Andrew Wilcox <AWilcox@Wilcox-Tech.com> | 2016-04-24 01:45:27 -0500 |
|---|---|---|
| committer | Andrew Wilcox <AWilcox@Wilcox-Tech.com> | 2016-04-24 01:45:27 -0500 |
| commit | 18943b88d76364e85331414c08bbeeae80fc29a8 (patch) | |
| tree | 9b98a1afe206edc15c8c4e591833d81ebf10993d | |
| parent | da79ab08e87d6b40d543739eb8018602d48fb9e9 (diff) | |
| download | apkkit-18943b88d76364e85331414c08bbeeae80fc29a8.tar.gz apkkit-18943b88d76364e85331414c08bbeeae80fc29a8.tar.bz2 apkkit-18943b88d76364e85331414c08bbeeae80fc29a8.tar.xz apkkit-18943b88d76364e85331414c08bbeeae80fc29a8.zip | |
Portage integration: Fix blocker issue correctly this time
| -rw-r--r-- | apkkit/portage.py | 5 |
1 files 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) |