Commit 33f1f12e authored by Vitaly Lipatov's avatar Vitaly Lipatov

rpmreqs: fix for handle requires with dot with names (exclude .so. only)

parent 621bd637
......@@ -131,7 +131,7 @@ trans_rpmdeps_to_pkgname_lav()
REQLIST=$(estrlist reg_wordexclude "$ALREADYHANDLEDRPM" "$REQLIST")
# FIXME: strange regexp for drop libNAME.so.NUM and perl(Package) and /bin/sh
REALPKGNAMELIST=$(estrlist reg_exclude "\. /.* (.*" "$REQLIST")
REALPKGNAMELIST=$(estrlist reg_exclude "\.so\. /.* (.*" "$REQLIST")
# FIXME: external list? Set priorities/
REQCONVLIST=$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST" | filter_multiple_provides | sed -e "s|(64bit)|.*(64bit)|g")
......@@ -141,6 +141,8 @@ trans_rpmdeps_to_pkgname_lav()
#REQLIST=$(regexp_exclude_list "VIRTREQ" "$REQLIST")
# TODO: we have store_output function
TFILE=$(make_temp_file)
PKGFILES=
if [ -n "$REQCONVLIST" ] ; then
PKGFILES=$(LANG=C apt-get install --print-uris $REQCONVLIST 2>$TFILE | egrep "(^Selecting|.* is already the newest version.)" | sed -e "s|^Selecting ||g" | sed -e "s| is already the newest version.||g" | sed -e "s| .*||g" | sort -u | filter_pkgname) || warning "Error return code from apt-get install"
if grep -q "is a virtual package provided by" $TFILE ; then
local INSTALLMARK="\[Installed\]"
......@@ -153,6 +155,7 @@ trans_rpmdeps_to_pkgname_lav()
fi
PKGFILES="$PKGFILES $PKGINSTALLED"
fi
fi
if grep -q "Couldn't find package" $TFILE ; then
fatal "$(cat $TFILE | grep "Couldn't find package")"
......
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