aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2012-09-26 17:36:32 +0000
committerNicolas Vigier <boklm@mageia.org>2012-09-26 17:36:32 +0000
commit72fba6ddb5134d927a87c1a62016599bc485cec4 (patch)
tree69d081c336c6d81ee19100f5ea7e9afe0c02fabc /modules/buildsystem
parent6333ebbb60085b35e260b0358231dc1549a6ca2c (diff)
downloadpuppet-72fba6ddb5134d927a87c1a62016599bc485cec4.tar
puppet-72fba6ddb5134d927a87c1a62016599bc485cec4.tar.gz
puppet-72fba6ddb5134d927a87c1a62016599bc485cec4.tar.bz2
puppet-72fba6ddb5134d927a87c1a62016599bc485cec4.tar.xz
puppet-72fba6ddb5134d927a87c1a62016599bc485cec4.zip
use different rpmlint command on cauldron and older releases
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/youri/submit-todo.conf15
-rw-r--r--modules/buildsystem/templates/youri/submit-upload.conf16
2 files changed, 30 insertions, 1 deletions
diff --git a/modules/buildsystem/templates/youri/submit-todo.conf b/modules/buildsystem/templates/youri/submit-todo.conf
index aa27c3c5..55cf81b0 100644
--- a/modules/buildsystem/templates/youri/submit-todo.conf
+++ b/modules/buildsystem/templates/youri/submit-todo.conf
@@ -153,6 +153,21 @@ checks:
- summary-ended-with-dot
- invalid-spec-name
- noarch-python-in-64bit-path
+ cauldron:
+ config: /usr/share/rpmlint/config
+ path: /usr/bin/rpmlint
+ 1:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ 2:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ infra_1:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ infra_2:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
svn:
class: Youri::Submit::Check::SVN
diff --git a/modules/buildsystem/templates/youri/submit-upload.conf b/modules/buildsystem/templates/youri/submit-upload.conf
index f138f44a..095f3ac8 100644
--- a/modules/buildsystem/templates/youri/submit-upload.conf
+++ b/modules/buildsystem/templates/youri/submit-upload.conf
@@ -172,7 +172,6 @@ checks:
rpmlint:
class: Youri::Submit::Check::Rpmlint
options:
- config: /etc/rpmlint/config
results:
- buildprereq-use
- no-description-tag
@@ -201,6 +200,21 @@ checks:
- dir-or-file-in-opt
- dir-or-file-in-home
- dir-or-file-in-var-local
+ cauldron:
+ config: /usr/share/rpmlint/config
+ path: /usr/bin/rpmlint
+ 1:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ 2:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ infra_1:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
+ infra_2:
+ config: /usr/share/rpmlint/config.mga2
+ path: /usr/bin/mga2-rpmlint
svn:
class: Youri::Submit::Check::SVN