aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2011-05-30 11:51:14 +0000
committerPascal Terjan <pterjan@mageia.org>2011-05-30 11:51:14 +0000
commitcfda45c4e72a16b2a751d88314a3d2f5741f180c (patch)
tree53da4e4ab431f4f84a9d0db0deb37a22929ad97b
parent8eff654e8f51fe6176acc310ef9aba173905006c (diff)
downloadpuppet-cfda45c4e72a16b2a751d88314a3d2f5741f180c.tar
puppet-cfda45c4e72a16b2a751d88314a3d2f5741f180c.tar.gz
puppet-cfda45c4e72a16b2a751d88314a3d2f5741f180c.tar.bz2
puppet-cfda45c4e72a16b2a751d88314a3d2f5741f180c.tar.xz
puppet-cfda45c4e72a16b2a751d88314a3d2f5741f180c.zip
Always define distro_section now that mkrel does the right thing
-rw-r--r--modules/buildsystem/templates/upload.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index ba632652..e28df8f2 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 --rpmmacros \"%distro_section \$([ __SECTION__ != core ] && echo __SECTION__ || echo %nil)\" --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
+ command => "iurt --copy_srpm --group --rpmmacros \"%distro_section __SECTION__\" --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
packages => "$homedir/iurt/",
},
});