Commit 8ba480ec authored by Vitaly Lipatov's avatar Vitaly Lipatov

s/regexp_exclude/reg_exclude/

parent 5ee84b35
...@@ -71,7 +71,7 @@ install_packages() ...@@ -71,7 +71,7 @@ install_packages()
docmd $SUDO apt-get install $LIST docmd $SUDO apt-get install $LIST
ALREADYHANDLEDAPT="$ALREADYHANDLEDAPT $LIST" ALREADYHANDLEDAPT="$ALREADYHANDLEDAPT $LIST"
REQLIST="$($ETERBUILDBIN/rpmreqs $LIST)" REQLIST="$($ETERBUILDBIN/rpmreqs $LIST)"
REQLIST=$(estrlist regexp_exclude "$ALREADYHANDLEDRPM" "$REQLIST") REQLIST=$(estrlist reg_exclude "$ALREADYHANDLEDRPM" "$REQLIST")
test -n "$REQLIST" || { echog "There is no more req packages to install" ; return ; } test -n "$REQLIST" || { echog "There is no more req packages to install" ; return ; }
install_by_requires $REQLIST install_by_requires $REQLIST
......
...@@ -69,9 +69,9 @@ trans_rpmdeps_to_pkgname_ldv() ...@@ -69,9 +69,9 @@ trans_rpmdeps_to_pkgname_ldv()
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=$(estrlist regexp_exclude "$ALREADYHANDLEDRPM" "$REQLIST") REQLIST=$(estrlist reg_exclude "$ALREADYHANDLEDRPM" "$REQLIST")
REALPKGNAMELIST=$(estrlist regexp_exclude ". /*" "$REQLIST") REALPKGNAMELIST=$(estrlist reg_exclude ". /*" "$REQLIST")
REQCONVLIST=$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST") REQCONVLIST=$(estrlist exclude "$REALPKGNAMELIST" "$REQLIST")
set_hasherdir set_hasherdir
...@@ -117,7 +117,7 @@ common-licenses ...@@ -117,7 +117,7 @@ common-licenses
librpmbuild librpmbuild
passwdqc-control" passwdqc-control"
REQLIST=$(estrlist union $(convert_pkgfile_to_pkgname $PKGFILES) $REALPKGNAMELIST) REQLIST=$(estrlist union $(convert_pkgfile_to_pkgname $PKGFILES) $REALPKGNAMELIST)
REQLIST=$(estrlist regexp_exclude "$ALREADYHANDLEDRPM" "$REQLIST" ) REQLIST=$(estrlist reg_exclude "$ALREADYHANDLEDRPM" "$REQLIST" )
estrlist union $REQLIST estrlist union $REQLIST
} }
...@@ -142,7 +142,7 @@ trans_rpmdeps_to_pkgname_lav() ...@@ -142,7 +142,7 @@ trans_rpmdeps_to_pkgname_lav()
# partially copied from aptU # partially copied from aptU
#VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u) #VIRTREQ=$(LANG=C apt-get install --print-uris $REQLIST 2>&1 | grep "is a virtual package provided by" | cut -f2 -d" " | sort -u)
#FIXME: f.i., we got /usr/bin/lpstat in VIRTREQ (select cups or lprng package?). Skip now #FIXME: f.i., we got /usr/bin/lpstat in VIRTREQ (select cups or lprng package?). Skip now
#REQLIST=$(estrlist regexp_exclude "VIRTREQ" "$REQLIST") #REQLIST=$(estrlist reg_exclude "VIRTREQ" "$REQLIST")
# TODO: we have store_output function # TODO: we have store_output function
TFILE=$(make_temp_file) TFILE=$(make_temp_file)
PKGFILES= PKGFILES=
......
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