summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle Keen <keenerd@gmail.com>2016-01-22 21:51:57 -0500
committerKyle Keen <keenerd@gmail.com>2016-01-22 21:51:57 -0500
commiteda85e92d1e58c2847569544822f22b8bb500743 (patch)
tree8218cb27ae4bbf0adfe6492e452ea72bcb6594d0
parenta521794446e9da4186636351e25bf79dab461ee4 (diff)
downloadnamcap-eda85e92d1e58c2847569544822f22b8bb500743.tar.gz
namcap-eda85e92d1e58c2847569544822f22b8bb500743.zip
more CARCH variations (FS#47862)
-rw-r--r--Namcap/rules/extravars.py12
1 files changed, 5 insertions, 7 deletions
diff --git a/Namcap/rules/extravars.py b/Namcap/rules/extravars.py
index 7656948..df0c0bf 100644
--- a/Namcap/rules/extravars.py
+++ b/Namcap/rules/extravars.py
@@ -25,15 +25,13 @@ class package(PkgbuildRule):
name = "extravars"
description = "Verifies that extra variables start with an underscore"
def analyze(self, pkginfo, tar):
- stdvars = ['arch', 'license', 'depends', 'makedepends',
- 'provides', 'conflicts' , 'replaces', 'backup',
- 'source', 'noextract', 'md5sums', 'sha1sums',
- 'sha256sums', 'sha384sums', 'sha512sums', 'pkgname',
+ carch_vars = ['checkdepends', 'conflicts', 'depends', 'makedepends',
+ 'optdepends', 'provides', 'replaces', 'source', 'md5sums',
+ 'sha1sums', 'sha256sums', 'sha384sums', 'sha512sums']
+ stdvars = ['arch', 'license', 'backup', 'noextract', 'pkgname',
'pkgbase', 'pkgver', 'pkgrel', 'epoch', 'pkgdesc', 'groups',
'url', 'install', 'changelog',
- 'options', 'optdepends', 'checkdepends', 'validpgpkeys']
- carch_vars = ['checkdepends', 'conflicts', 'depends',
- 'makedepends', 'optdepends', 'provides', 'replaces', 'source']
+ 'options', 'validpgpkeys'] + carch_vars
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"]: