From 5faa3d877654b395ca8ee16840ba8ddccc3c3bdd Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Sat, 17 Mar 2012 22:48:28 +0100 Subject: [PATCH] pck-update: treat rpm --specfile --specedit errors as warnings Signed-off-by: Davide Madrisan --- ChangeLog | 5 +++++ plugins/pck-update.in | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fe05ca..6a82839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,11 @@ Changes in version 1.9.3 Action 6: do not display the rpm message "no package provides...": it 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 diff --git a/plugins/pck-update.in b/plugins/pck-update.in index fe8203e..a77e222 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -454,8 +454,10 @@ rpm -q $rpmbuild_opts $USER_RPMDEFINE_OPTS --specfile --specedit\ $SRPM_SPECFILE_WITH_PATH \ 2> $tmpspreprerr >> $specfile_preprocessed" [ -s "$tmpspreprerr" ] && - { notify.error $"specfile has errors:""\n$(\ - while read line; do echo " $line"; done < $tmpspreprerr)"; } + { notify.warning $"specfile has errors:" + while read line; do + notify.warning " $line" + done < $tmpspreprerr; } rm -f $tmpspreprerr fi