Commit 90eba974 authored by Vitaly Lipatov's avatar Vitaly Lipatov

trans_rpmdeps_to_pkgname: remove get rpmdeps (do it separately)

parent e434fd9a
...@@ -109,7 +109,7 @@ pkg_release_check() ...@@ -109,7 +109,7 @@ pkg_release_check()
# copied from aptU # copied from aptU
get_rpmpkg_requires() get_rpmpkg_requires()
{ {
rpmquery --requires $@ | cut -f1 -d" " | sed -e "s|([A-Z].*||g" | sort -u rpmquery --requires $@ | cut -f1 -d" " | sed -e "s|([A-Z].*||g" | grep -v "^rpmlib" | sort -u
} }
# Translate requires from local rpm package to package names (on local ALT Linux Sisyphus) # Translate requires from local rpm package to package names (on local ALT Linux Sisyphus)
...@@ -120,8 +120,7 @@ trans_rpmdeps_to_pkgname() ...@@ -120,8 +120,7 @@ trans_rpmdeps_to_pkgname()
# partially copied from aptU # partially copied from aptU
local ALREADYHANDLEDRPM="rpmlib.* rtld libgcc_s\..* libstdc\+\+.* libc\.so.* ld-linux\.so.* libpthread\.so.* librt\.so.*" local ALREADYHANDLEDRPM="rpmlib.* rtld libgcc_s\..* libstdc\+\+.* libc\.so.* ld-linux\.so.* libpthread\.so.* librt\.so.*"
local REQLIST local REQLIST="$@"
REQLIST=$(get_rpmpkg_requires -p "$1")
REQLIST=$(regexp_exclude_list "$ALREADYHANDLEDRPM" "$REQLIST") REQLIST=$(regexp_exclude_list "$ALREADYHANDLEDRPM" "$REQLIST")
# partially copied from aptU # partially copied from aptU
......
...@@ -6,4 +6,5 @@ load_mod alt ...@@ -6,4 +6,5 @@ load_mod alt
#testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/CentOS/6/nxclient-*.i586.rpm) #testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/CentOS/6/nxclient-*.i586.rpm)
testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/ALTLinux/Sisyphus/rx-etersoft-*.i586.rpm) testfile=$(echo /var/ftp/pub/Etersoft/RX@Etersoft/testing/ALTLinux/Sisyphus/rx-etersoft-*.i586.rpm)
trans_rpmdeps_to_pkgname $testfile REQLIST="$(get_rpmpkg_requires -p "$testfile")"
trans_rpmdeps_to_pkgname $REQLIST
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