Axe leftover CANONARCH assignment messing up our "base" archs (RhBug:808250)
authorPanu Matilainen <pmatilai@redhat.com>
Fri, 30 Mar 2012 06:56:43 +0000 (09:56 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Fri, 30 Mar 2012 07:05:20 +0000 (10:05 +0300)
- This should've been in commit 2a8d03669732f68f02fa7b21ec87ee3f65d11e5b,
  the leftover CANONARCH resets the "base arch" we just set to a wrong
  value.
(cherry picked from commit 7c39c65da4b1b012061ffbac179a650643d00ba9)

installplatform

index c56d566..f7ae241 100755 (executable)
@@ -111,8 +111,6 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
   # skip architectures for which we dont have full config parameters
   [ -z "$CANONARCH" ] && continue
 
-  CANONARCH="`echo $ARCH|sed -e "$canonarch_sed"`"
-
   if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
       LIB=${LIB}64
   fi