Commit 1280dd98 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm restore: add comments, skip empty package names

parent fcf8f286
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
load_helper epm-sh-altlinux load_helper epm-sh-altlinux
load_helper epm-assure load_helper epm-assure
# FIXME: python modules are packaged into python packages, but we have only module names and rpm package names instead of python packages
__epm_filter_pip_to_rpm() __epm_filter_pip_to_rpm()
{ {
tr "A-Z" "a-z" | sed -e "s|-|_|g" -e "s|^python_||" \ tr "A-Z" "a-z" | sed -e "s|-|_|g" -e "s|^python_||" \
...@@ -27,6 +28,7 @@ __epm_filter_pip_to_rpm() ...@@ -27,6 +28,7 @@ __epm_filter_pip_to_rpm()
-e "s|pillow|PIL|" \ -e "s|pillow|PIL|" \
-e "s|pyjwt|jwt|" \ -e "s|pyjwt|jwt|" \
-e "s|pyyaml|yaml|" \ -e "s|pyyaml|yaml|" \
-e "s|attrs|attr|" \
-e "s|memcached|memcache|" \ -e "s|memcached|memcache|" \
-e "s|pyopenssl|OpenSSL|" -e "s|pyopenssl|OpenSSL|"
} }
...@@ -39,7 +41,7 @@ __epm_restore_pip() ...@@ -39,7 +41,7 @@ __epm_restore_pip()
local ilist='' local ilist=''
while read l ; do while read l ; do
local t="$(echo "$l" | sed -e "s| *[<>]*=.*||" | __epm_filter_pip_to_rpm)" local t="$(echo "$l" | sed -e "s| *[<>]*=.*||" | __epm_filter_pip_to_rpm)"
if echo "$l" | grep -qE "^ *#" ; then if echo "$l" | grep -qE "^ *#" || [ -z "$l" ] ; then
continue continue
fi fi
if echo "$l" | grep -qE "://" ; then if echo "$l" | grep -qE "://" ; then
...@@ -54,6 +56,7 @@ __epm_restore_pip() ...@@ -54,6 +56,7 @@ __epm_restore_pip()
echo " $t is python2 only requirement, skipped" echo " $t is python2 only requirement, skipped"
continue continue
fi fi
# TODO: python3-egg-info($t)
local pi="python3($t)" local pi="python3($t)"
echo " $l -> $t -> $pi" echo " $l -> $t -> $pi"
[ -n "$t" ] || continue [ -n "$t" ] || continue
......
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