From b3419dc9c0a093186a1bd1410a1f7abfc779f70f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 26 Sep 2014 13:13:14 +0200 Subject: [PATCH] pck-update: fix duplicated names in BuildRequires: in multiarch systems (x86_64) --- plugins/pck-update.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 8b746b6..a6a4cde 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -2334,7 +2334,7 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")" fi if [ "$solibpath_catch" ]; then rpm --qf %{name} -qf $solibpath_catch &>/dev/null && - buildreq="$(rpm --qf %{name} -qf $solibpath_catch)" || + buildreq="$(rpm --qf "%{name}\n" -qf $solibpath_catch|head -n1)" || echo "\ #$req: $solibpath_catch: file not owned by any package" else @@ -2358,7 +2358,7 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")" -a "${buildreq/%-devel/}" = "$buildreq" ]; then # if a -devel exists for this package, use it rpm -q ${buildreq}-devel &>/dev/null && - buildreq="$(rpm -q --qf %{name} ${buildreq}-devel)" + buildreq="$(rpm -q --qf "%{name}\n" ${buildreq}-devel|head -n1)" fi if [ "$buildreq" ]; then # finally print buildrequires block