diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2011-05-29 14:52:13 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2011-05-29 14:52:13 +0000 |
| commit | 7e27a0f35669400b9adaed42c626b48d35d2b4e5 (patch) | |
| tree | 0d7dfa5935b71c44d2b06fcae0881c1078b6ed41 /modules | |
| parent | 50eb2691f428af99e302c306bbb7eac73e800202 (diff) | |
| download | puppet-7e27a0f35669400b9adaed42c626b48d35d2b4e5.tar puppet-7e27a0f35669400b9adaed42c626b48d35d2b4e5.tar.gz puppet-7e27a0f35669400b9adaed42c626b48d35d2b4e5.tar.bz2 puppet-7e27a0f35669400b9adaed42c626b48d35d2b4e5.tar.xz puppet-7e27a0f35669400b9adaed42c626b48d35d2b4e5.zip | |
Define distrib_section and allow uploading to another section
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/buildsystem/templates/submit-todo.conf | 2 | ||||
| -rw-r--r-- | modules/buildsystem/templates/upload.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/submit-todo.conf b/modules/buildsystem/templates/submit-todo.conf index c9c83d09..4a7016d8 100644 --- a/modules/buildsystem/templates/submit-todo.conf +++ b/modules/buildsystem/templates/submit-todo.conf @@ -30,7 +30,7 @@ targets: - tag - acl - host - - section + #- section - rpmlint - recency #- history diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf index f4e69bd3..01e7dd76 100644 --- a/modules/buildsystem/templates/upload.conf +++ b/modules/buildsystem/templates/upload.conf @@ -26,7 +26,7 @@ my $homedir = "<%= build_home_dir %>"; user => '<%= build_login %>', # (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind # command => "iurt --copy-srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --additional-media -m __MEDIA__ -- file://$homedir/cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", - command => "iurt --copy_srpm --group --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", + command => "iurt --copy_srpm --group --rpmmacros \"\$([ __SECTION__ != core ] && echo %distrib_section __SECTION__)\" --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__", packages => "$homedir/iurt/", }, }); |