Commit a2e617b4c20f6494e639abba142f75638a906af9

Authored by Silvan Calarco
1 parent b3419dc9c0
Exists in master

pck-update: buildreqs_to_install: keep conservative classic behaviour on archs different from x86_64

Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff

plugins/pck-update.in
... ... @@ -1992,11 +1992,14 @@
1992 1992 buildreqs_to_install=(
1993 1993 $(for f in ${buildreqs_to_install[@]}; do
1994 1994 if [ "${f/.*}" != "${f}" ]; then
1995   - # if arch specified convert from spec to smart format: package.arch -> package@arch
  1995 + # if arch specified convert e.g. package.i586 to package@i586
1996 1996 echo ${f/./@}
1997   - else
1998   - # if not add arch (FIXME: smart won't find package if noarch)
  1997 + elif [ "${BUILD_ARCH}" == "x86_64" ]; then
  1998 + # x86_64: specifying arch is necessary (FIXME: problems with .noarch)
1999 1999 echo $f@$target_cpu
  2000 + else
  2001 + # classic behaviour
  2002 + echo $f
2000 2003 fi
2001 2004 done | sort -u))
2002 2005