Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adélie Linux
apkkit
Commits
18943b88
Commit
18943b88
authored
Apr 24, 2016
by
A. Wilcox
🦊
Browse files
Portage integration: Fix blocker issue correctly this time
parent
da79ab08
Changes
1
Hide whitespace changes
Inline
Side-by-side
apkkit/portage.py
View file @
18943b88
...
...
@@ -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
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment