summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Keen <keenerd@gmail.com>2015-06-25 12:25:30 -0400
committerKyle Keen <keenerd@gmail.com>2015-06-25 12:25:30 -0400
commit723753105a358bf6d2f8c5289a0d253aa70a52f9 (patch)
tree038e6b341b2191a36aaf2af12611fdf4895b8a7d
parent4987254843c9e6523cab1b62ed63addd2a1ac685 (diff)
downloadnamcap-723753105a358bf6d2f8c5289a0d253aa70a52f9.tar.gz
namcap-723753105a358bf6d2f8c5289a0d253aa70a52f9.zip
Generalized architecture specific depends
-rw-r--r--Namcap/rules/extravars.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Namcap/rules/extravars.py b/Namcap/rules/extravars.py
index 418e058..7656948 100644
--- a/Namcap/rules/extravars.py
+++ b/Namcap/rules/extravars.py
@@ -18,6 +18,7 @@
#
import re
+from itertools import product
from Namcap.ruleclass import *
class package(PkgbuildRule):
@@ -30,8 +31,11 @@ class package(PkgbuildRule):
'sha256sums', 'sha384sums', 'sha512sums', 'pkgname',
'pkgbase', 'pkgver', 'pkgrel', 'epoch', 'pkgdesc', 'groups',
'url', 'install', 'changelog',
- 'options', 'optdepends', 'checkdepends', 'validpgpkeys',
- 'depends_i686', 'depends_x86_64']
+ 'options', 'optdepends', 'checkdepends', 'validpgpkeys']
+ carch_vars = ['checkdepends', 'conflicts', 'depends',
+ 'makedepends', 'optdepends', 'provides', 'replaces', 'source']
+ if 'arch' in pkginfo and len(pkginfo["arch"]) >= 2:
+ stdvars.extend(v+'_'+a for v,a in product(carch_vars, pkginfo["arch"]))
for varname in pkginfo["setvars"]:
if varname.islower() and varname not in stdvars \
and not varname.startswith('_'):