Kaydet (Commit) b560a843 authored tarafından Mehmet Emre Atasever's avatar Mehmet Emre Atasever

revert <ExcludeArch> regex support, add armv7l to the <ExcludeArch> values

üst f291d21f
......@@ -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>
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment