summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2012-10-11 17:57:10 +0300
committerPanu Matilainen <pmatilai@redhat.com>2012-12-07 14:22:29 +0200
commit539b918d838a23485cd0017c19e24af412520e44 (patch)
tree35f8d9cb1b7bd1cc88441067e7cc5d9c07fbedc4
parent43297c5e0c1910a6e4220d42bd9e91581ad9b769 (diff)
downloadrpm-539b918d838a23485cd0017c19e24af412520e44.tar.gz
Fix noarch __isa_* macro filter in installplatform (RhBug:865436)
- The filter wasn't doing what it was supposed to due to extra single quotes getting inserted, causing "rpmbuild --target noarch foo.spec" to whine about empty macro bodies. This is a regression introduced in rpm 4.10, commit 07ec480c180e4005a629242b8f9f8ab640e3e950 to be precise. (cherry picked from commit 90dd51743200055f30d9e0e0337173118b4ae756)
-rwxr-xr-xinstallplatform2
1 files changed, 1 insertions, 1 deletions
diff --git a/installplatform b/installplatform
index f7ae24128..a68b3c06a 100755
--- a/installplatform
+++ b/installplatform
@@ -104,7 +104,7 @@ for ARCH in noarch `grep ^arch_canon $RPMRC | cut -d: -f2`; do
noarch)
CANONARCH=noarch
CANONCOLOR=0
- FILTER="grep -v -E '^(%optflag|%__isa)'"
+ FILTER="grep -v -E ^(%optflag|%__isa)"
;;
esac