summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-10-06 00:52:53 +0800
committerruki <[email protected]>2022-10-06 00:52:53 +0800
commit9fcad1a90c2c750e2a2fa8c55962eb0f9495df8b (patch)
tree732e84aa8a3cf985739bec042d937f3f38f85c34
parentc90e166eed2825f574cf92e60d633e1790ff3e80 (diff)
improve tips
-rw-r--r--xmake/modules/private/action/require/impl/package.lua5
1 files changed, 1 insertions, 4 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index b6b218fdb..3b7875cc3 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -925,16 +925,13 @@ end
-- cannot be detected at present and can only be resolved by the user
--
function _check_package_depconflicts(package)
- local packages = {}
local packagekeys = {}
for _, dep in ipairs(package:librarydeps()) do
local key = _get_packagekey(dep:name(), dep:requireinfo())
local prevkey = packagekeys[dep:name()]
if prevkey then
- local prevpkg = packages[dep:name()]
- assert(key == prevkey, "package(%s in %s): conflict dependences with package(%s in %s)!", key, package:name(), prevkey, prevpkg:name())
+ assert(key == prevkey, "package(%s): conflict dependences with package(%s) in %s!", key, prevkey, package:name())
else
- packages[dep:name()] = package
packagekeys[dep:name()] = key
end
end