pck-update - apply the architecture dependent rules first

Apply the architecture dependent rules for unpackaged files
before the common ones.  This will also simplify the logic
of the path substitutions.

Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
Davide Madrisan 2014-08-26 19:59:50 +02:00
parent 609e1425ea
commit 6f965f674b

View File

@ -2178,9 +2178,8 @@ format_unpackaged_file_list_${target_cpu}"
[ "$skipline" = 1 ] || echo "$line"
done < <(LC_ALL=C eval rpmbuild -bl $rpmbuild_opts --nodeps --nobuild \
$SRPM_SPECFILE_WITH_PATH $USER_RPMDEFINE_OPTS 2>&1) | \
sed -e "$format_unpackaged_file_list_common;\
${!format_unpackaged_file_list_arch}" \
> $tmpunpackfiles
sed -e "${!format_unpackaged_file_list_arch};\
$format_unpackaged_file_list_common" > $tmpunpackfiles
if [ -s "$tmpunpackfiles" ]; then
notify.error $"\