From e7cefb0ed0db111887db5d0feffbe7b12ae75236 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Tue, 17 Jan 2012 23:21:07 +0100 Subject: [PATCH] pck-update: print the list of packages before running the tests Signed-off-by: Davide Madrisan --- ChangeLog | 8 ++++++++ plugins/pck-update.in | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cfbd2fb..4f9237b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,14 @@ Sun Jan 15 2012 Davide Madrisan directories, to avoid false positives (seen for files whose names include the substring '.so', like 'net.sourceforge.kile.main.xml'). + * pck-update - Davide Madrisan: + Ignore lines starting with '#' while checking for 'configure' and 'make' + calls in the specfile. + ++ update + * pck-update - Davide Madrisan: + Print the list of packages before running the tests. + -------------------------------------------------------------------------------- Changes in version 1.8.2 diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 6c25a03..5e5d6dc 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -711,9 +711,9 @@ use rpm macros if possible:"" \`$token' --> \`$rpm_macro_make'" ;; # - look in the block : `%install' to `%changelog' sed -n '/%install/,/%changelog/p' $specfile | \ while read -a tokens; do + # ignore comments + [[ "${tokens[0]}" =~ ^\# ]] && continue for token in ${tokens[*]}; do - # ignore comments - [[ "${tokens[0]}" =~ ^\# ]] && continue case "$token" in make) [[ "$rpm_macro_make" ]] && notify.warning $"\ @@ -2526,6 +2526,7 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.noarch.rpm" notify.error $"package not found"": \`$pcknew_name'" echo "rpmpkg_name[$i]=\"$rpms_dir/noarch/$pcknew_name\"" \ >> $tmpextractdir/rpmpkg.info + notify.note " $pcknew_name" else pcknew_name="\ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm" @@ -2533,6 +2534,7 @@ $pck-$pck_rpmversion-$pck_rpmrelease$DISTRO_rpm.$target_cpu.rpm" notify.error $"package not found"": \`$pcknew_name'" echo "rpmpkg_name[$i]=\"$rpms_dir/$target_cpu/$pcknew_name\"" \ >> $tmpextractdir/rpmpkg.info + notify.note " $pcknew_name" fi notify.debug "$FUNCNAME: pcknew_name[$i] = $pcknew_name" let "i += 1"