pck-update: treat rpm --specfile --specedit errors as warnings

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2012-03-17 22:48:28 +01:00
parent c8909a86fb
commit 5faa3d8776
2 changed files with 9 additions and 2 deletions

View File

@ -26,6 +26,11 @@ Changes in version 1.9.3
Action 6: do not display the rpm message "no package provides...": it Action 6: do not display the rpm message "no package provides...": it
will be a duplicate entry in the list of unresolved build requirements. will be a duplicate entry in the list of unresolved build requirements.
* pck-update - Davide Madrisan:
infofile.create(): "rpm --specfile --specedit" is buggy so it's better to
treat errors as warnings in autospec and not to stop the script execution.
(Problem detected by Silvan Calarco.)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 1.9.2 Changes in version 1.9.2

View File

@ -454,8 +454,10 @@ rpm -q $rpmbuild_opts $USER_RPMDEFINE_OPTS --specfile --specedit\
$SRPM_SPECFILE_WITH_PATH \ $SRPM_SPECFILE_WITH_PATH \
2> $tmpspreprerr >> $specfile_preprocessed" 2> $tmpspreprerr >> $specfile_preprocessed"
[ -s "$tmpspreprerr" ] && [ -s "$tmpspreprerr" ] &&
{ notify.error $"specfile has errors:""\n$(\ { notify.warning $"specfile has errors:"
while read line; do echo " $line"; done < $tmpspreprerr)"; } while read line; do
notify.warning " $line"
done < $tmpspreprerr; }
rm -f $tmpspreprerr rm -f $tmpspreprerr
fi fi