Commit 064ec533 authored by Vitaly Lipatov's avatar Vitaly Lipatov

inroduce get_name (for spec) and use it

parent 065e6d35
...@@ -87,7 +87,7 @@ for i in $SPECLIST ; do ...@@ -87,7 +87,7 @@ for i in $SPECLIST ; do
# it is rpm package # it is rpm package
PKGNAME=$(querypackage $i NAME) PKGNAME=$(querypackage $i NAME)
else else
PKGNAME=$(eval_spec $i | get_var "Name") PKGNAME=$(get_name $i)
test -z ${PKGNAME} && fatal "Cannot get package name" test -z ${PKGNAME} && fatal "Cannot get package name"
fi fi
else else
......
...@@ -102,7 +102,7 @@ get_pagepkginfo() ...@@ -102,7 +102,7 @@ get_pagepkginfo()
PKGVERSION=$(querypackage ${i} VERSION) PKGVERSION=$(querypackage ${i} VERSION)
PKGNAME=$(querypackage ${i} sourcerpm | sed -e "s|-$PKGVERSION.*||g") PKGNAME=$(querypackage ${i} sourcerpm | sed -e "s|-$PKGVERSION.*||g")
else else
PKGNAME=$(eval_spec ${i} | get_var "Name") PKGNAME=$(get_name ${i})
fi fi
else else
# installed package name # installed package name
......
...@@ -73,6 +73,11 @@ inc_subrelease() ...@@ -73,6 +73,11 @@ inc_subrelease()
set_release "$1" "$(get_txtrelease $1)${MAJOR}.$(($MINOR + 1 ))" set_release "$1" "$(get_txtrelease $1)${MAJOR}.$(($MINOR + 1 ))"
} }
get_name()
{
eval_spec $1 | get_var "Name"
}
get_version() get_version()
{ {
eval_spec $1 | get_var "Version" eval_spec $1 | get_var "Version"
......
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