Skip to content

E
etersoft-build-utils
Commit 3da62cf5 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rpmbph: small optimize with out of cycle print_*repl_list

parent 01cea01b
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
bin/rpmbph
View file @ 3da62cf5
...@@ -131,8 +131,9 @@ if [ -n "$VERBOSE" ] ; then ...@@ -131,8 +131,9 @@ if [ -n "$VERBOSE" ] ; then
echo echo
fi fi
local pkgrepl_list=$(print_pkgrepl_list)
for i in $LISTDEP ; do for i in $LISTDEP ; do
tolocal_anyrepl $i `print_pkgrepl_list` || continue tolocal_anyrepl $i $pkgrepl_list || continue
#NRL="s!\(.*Req.*\)$REPLRULE1\( |,|\$\)!\1$REPLRULE2\2!g" #NRL="s!\(.*Req.*\)$REPLRULE1\( |,|\$\)!\1$REPLRULE2\2!g"
NRL="s!(.*Req.*)$ALTPKGNAME( |,|\$)!\1$TARGETPKGNAME\2!g" NRL="s!(.*Req.*)$ALTPKGNAME( |,|\$)!\1$TARGETPKGNAME\2!g"
[ -n "$VERBOSE" ] && echo "Use req rule $NRL" [ -n "$VERBOSE" ] && echo "Use req rule $NRL"
...@@ -142,8 +143,9 @@ done ...@@ -142,8 +143,9 @@ done
# Build replacement rules for spec # Build replacement rules for spec
[ -n "$VERBOSE" ] && echo "Checking group names for $LISTGROUP" [ -n "$VERBOSE" ] && echo "Checking group names for $LISTGROUP"
ALLGRPREPLRULES="" ALLGRPREPLRULES=""
grprepl_list=$(print_grprepl_list)
for i in $LISTGROUP ; do for i in $LISTGROUP ; do
tolocal_anyrepl $i `print_grprepl_list` || continue tolocal_anyrepl $i $grprepl_list || continue
#NRL="s!\(Group.*\)$REPLRULE1\( |,|\$\)!\1$REPLRULE2\2!g" #NRL="s!\(Group.*\)$REPLRULE1\( |,|\$\)!\1$REPLRULE2\2!g"
NRL="s!(Group.*)$ALTPKGNAME( |,|\$)!\1$TARGETPKGNAME\2!g" NRL="s!(Group.*)$ALTPKGNAME( |,|\$)!\1$TARGETPKGNAME\2!g"
[ -n "$VERBOSE" ] && echo "Use group name rule $NRL" [ -n "$VERBOSE" ] && echo "Use group name rule $NRL"
......
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