Commit ec0f8612 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm-removerepo: fix all removing

parent aa2e295f
...@@ -55,17 +55,21 @@ __epm_grep_repo_list() ...@@ -55,17 +55,21 @@ __epm_grep_repo_list()
# remove grepped lines # remove grepped lines
__epm_removerepo_alt_grepremove() __epm_removerepo_alt_grepremove()
{ {
local rl local rl="$1"
if [ "$rl" = "all" ] ; then
rl=".*"
fi
# ^rpm means full string # ^rpm means full string
if [ "$1" = "all" ] || rhas "$1" "^rpm" ; then if !rhas "$1" "^rpm" ; then
rl="$1"
else
rl="$(__epm_grep_repo_list "$@" 2>/dev/null)" rl="$(__epm_grep_repo_list "$@" 2>/dev/null)"
if [ -z "$rl" ] ; then if [ -z "$rl" ] ; then
[ -n "$verbose" ] && warning 'Can'\''t find '$*' in the repos (see # epm repolist output)' [ -n "$verbose" ] && warning 'Can'\''t find '$*' in the repos (see # epm repolist output)'
return 1 return 1
fi fi
fi fi
echo "$rl" | while read rp ; do echo "$rl" | while read rp ; do
__epm_removerepo_apt "$rp" __epm_removerepo_apt "$rp"
done done
...@@ -117,7 +121,7 @@ __epm_removerepo_alt() ...@@ -117,7 +121,7 @@ __epm_removerepo_alt()
fatal "epm removerepo: no options are supported" fatal "epm removerepo: no options are supported"
;; ;;
*) *)
if echo "$*" | grep -q "^rpm" ] ; then if echo "$*" | grep -q "^rpm" ; then
__epm_removerepo_apt "$*" __epm_removerepo_apt "$*"
else else
info "removing source.list entries by mask '$*'" info "removing source.list entries by mask '$*'"
......
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