From b560a8436a924acd3a74a81be577af92503a9137 Mon Sep 17 00:00:00 2001
From: Mehmet Emre Atasever <memre@pardus.org.tr>
Date: Wed, 27 Apr 2011 16:01:54 +0000
Subject: [PATCH] revert <ExcludeArch> regex support, add armv7l to the
 <ExcludeArch> values

---
 pisi-spec.rng            |  4 ++--
 pisi/operations/build.py | 12 ++++--------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pisi-spec.rng b/pisi-spec.rng
index 183835d0..de41c129 100644
--- a/pisi-spec.rng
+++ b/pisi-spec.rng
@@ -175,9 +175,9 @@
     <define name="ExcludeArch">
         <element name="ExcludeArch">
             <choice>
-                <value>i[3-6]86</value>
+                <value>i686</value>
                 <value>x86_64</value>
-                <value>arm.*</value>
+                <value>armv7l</value>
             </choice>
         </element>
     </define>
diff --git a/pisi/operations/build.py b/pisi/operations/build.py
index f87e4289..94530bb8 100644
--- a/pisi/operations/build.py
+++ b/pisi/operations/build.py
@@ -311,15 +311,11 @@ class Builder:
     def build(self):
         """Build the package in one shot."""
 
-        # excludeArch should accept regex.
-        # eg. <exludeArch>arm.*</exludeArch> armv7l, armv5te matches
-        #     <exludeArch>i[3-6]86</exludeArch> i386, i486, i586, i686 matches
         architecture = ctx.config.values.general.architecture
-        for arch in self.spec.source.excludeArch:
-            if re.match(arch, architecture):
-                raise ExcludedArchitectureException(
-                        _("pspec.xml avoids this package from building for '%s'")
-                        % architecture)
+        if architecture in self.spec.source.excludeArch:
+            raise ExcludedArchitectureException(
+                    _("pspec.xml avoids this package from building for '%s'")
+                    % architecture)
 
         ctx.ui.status(_("Building source package: %s")
                       % self.spec.source.name)