Commit 95ea2b24 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fix behaviour when has dir with the same name like package

parent f4c99622
...@@ -21,6 +21,7 @@ load_helper epm-query ...@@ -21,6 +21,7 @@ load_helper epm-query
epm_provides_files() epm_provides_files()
{ {
local pkg_files="$@"
[ -n "$pkg_files" ] || return [ -n "$pkg_files" ] || return
local PKGTYPE="$(get_package_type $pkg_files)" local PKGTYPE="$(get_package_type $pkg_files)"
...@@ -44,6 +45,7 @@ epm_provides_files() ...@@ -44,6 +45,7 @@ epm_provides_files()
epm_provides_names() epm_provides_names()
{ {
local pkg_names="$@"
local CMD local CMD
[ -n "$pkg_names" ] || return [ -n "$pkg_names" ] || return
...@@ -102,6 +104,6 @@ epm_provides() ...@@ -102,6 +104,6 @@ epm_provides()
{ {
[ -n "$pkg_filenames" ] || fatal "Provides: missing package(s) name" [ -n "$pkg_filenames" ] || fatal "Provides: missing package(s) name"
epm_provides_files epm_provides_files $pkg_files
epm_provides_names epm_provides_names $pkg_names $pkg_dirs
} }
...@@ -185,5 +185,5 @@ epm_query() ...@@ -185,5 +185,5 @@ epm_query()
__epm_query_file $pkg_files || return __epm_query_file $pkg_files || return
__epm_query_name $pkg_names || return __epm_query_name $pkg_names $pkg_dirs || return
} }
...@@ -21,6 +21,7 @@ load_helper epm-query ...@@ -21,6 +21,7 @@ load_helper epm-query
epm_requires_files() epm_requires_files()
{ {
local pkg_files="$@"
[ -n "$pkg_files" ] || return [ -n "$pkg_files" ] || return
local PKGTYPE="$(get_package_type $pkg_files)" local PKGTYPE="$(get_package_type $pkg_files)"
...@@ -42,6 +43,7 @@ epm_requires_files() ...@@ -42,6 +43,7 @@ epm_requires_files()
epm_requires_names() epm_requires_names()
{ {
local pkg_names="$@"
local CMD local CMD
[ -n "$pkg_names" ] || return [ -n "$pkg_names" ] || return
...@@ -101,6 +103,6 @@ docmd $CMD $pkg_names ...@@ -101,6 +103,6 @@ docmd $CMD $pkg_names
epm_requires() epm_requires()
{ {
[ -n "$pkg_filenames" ] || fatal "Requires: missing package(s) name" [ -n "$pkg_filenames" ] || fatal "Requires: missing package(s) name"
epm_requires_files epm_requires_files $pkg_files
epm_requires_names epm_requires_names $pkg_names $pkg_dirs
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment