openmamba/autospec
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

spec-create: support up to two nested @if/@else/@fi blocks in the templates

Browse Source
This commit is contained in:
Davide Madrisan 2011-12-18 14:18:35 +01:00
parent b35f72611b
commit 89e3325bea
2 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/spec-create.in
View File

@ -337,31 +337,46 @@ shared-libraries:,\
[ -r "$templatefile" ] || notify.error $"file not found"": $templatefile" [ -r "$templatefile" ] || notify.error $"file not found"": $templatefile"
local currvar line skipline=0 local currvar line if_value if_level=0
# FIXME: at most two nested @if statements are supported
if_value[0]='N/A'; if_value[1]='1'; if_value[2]='1';
local template_linenum=0
while read line; do while read line; do
# FIXME: this code does not support nested conditional statements template_linenum=$(($template_linenum + 1))
case "$line" in case "$line" in
@if:*) @if:*)
[ $if_level -ge 2 ] && notify.error "\
$spec_type ("$"line""#$template_linenum): "$"too many nested @if blocks"
if_level=$(($if_level + 1))
currvar="$(echo "$line" | sed "s,@if:\([^ \t]*\).*,\1,")" currvar="$(echo "$line" | sed "s,@if:\([^ \t]*\).*,\1,")"
[ "${!currvar}" = 1 ] || skipline=1 [ "${!currvar}" = 1 ] || if_value[$if_level]='0'
#echo "@if[$currvar]" notify.debug "\
#unset currvar $FUNCNAME: @if:$currvar lev:$if_level val:${if_value[$if_level]})"
continue continue
;; ;;
@else:*) @else:*)
#currvar="$(echo "$line" | sed "s,@if:\([^ \t]*'http://search.cpan.org/CPAN/authors/id/K/KB/KBAUCOM/Term-Animation-%{version}.tar.gz'\).*,\1,")" [ "$if_level" = '0' ] && notify.error "\
[ "$skipline" = 0 ] && skipline=1 || skipline=0 $spec_type ("$"line""#$template_linenum): "$"too many nested @if blocks"
if_value[$if_level]=$(( ! ${if_value[$if_level]} ))
notify.debug "\
$FUNCNAME: @else:$currvar lev:$if_level val:${if_value[$if_level]})"
continue
;; ;;
@fi:*) @fi:*)
#currvar="$(echo "$line" | sed "s,@fi:\([^ \t]*\).*,\1,")" [ "$if_level" = '0' ] && notify.error "\
skipline=0 $spec_type ("$"line""#$template_linenum): "$"@fi without @if statement"
if_value[$if_level]='1'
if_level=$(($if_level - 1))
notify.debug "\
$FUNCNAME: @fi:$currvar lev:$if_level val:${if_value[$if_level]})"
continue continue
;; ;;
@configure@) @configure@)
[ "$spec_cmd_configure" ] && echo "$line" | \ [ "$spec_cmd_configure" ] && echo "$line" | \
sed "s,@configure@,$spec_cmd_configure," sed "s,@configure@,$spec_cmd_configure,"
;; ;;
*) [ "$skipline" = 1 ] || echo "$line" | sed "\ *) [ "${if_value[1]}" = '1' -a ${if_value[2]} = '1' ] &&
echo "$line" | sed "\
s,@DISTRO@,${DISTRO:-?DISTRO?}, s,@DISTRO@,${DISTRO:-?DISTRO?},
s,@DISTRO_rpm@,${DISTRO_rpm:-?DISTRO_rpm?}, s,@DISTRO_rpm@,${DISTRO_rpm:-?DISTRO_rpm?},
s,@VENDOR@,${VENDOR:-?VENDOR?}, s,@VENDOR@,${VENDOR:-?VENDOR?},

13
po/it/spec-create.po
View File

@ -204,3 +204,16 @@ msgstr "sembra un modulo python (in questo caso usa \\`-t python')"
msgid "created specfile" msgid "created specfile"
msgstr "creato specfile" msgstr "creato specfile"
msgid "line"
msgstr "linea"
msgid "too many nested @if blocks"
msgstr "troppi livelli di blocchi @if"
msgid "@else without @if statement"
msgstr "@else senza un corrispondente @if"
msgid "@fi without @if statement"
msgstr "@fi senza un corrispondente @if"