aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-23 22:51:35 +0000
committerOlivier Blin <blino@mageia.org>2010-11-23 22:51:35 +0000
commit7b9c5195c61a61e6237458be52931ee7e5abb0ce (patch)
tree780d02bf9d2c57531341dc2563a1c462711d423e /modules/buildsystem
parent579f06757ff47d67bb05b0c05faa920a1a69d5e9 (diff)
downloadpuppet-7b9c5195c61a61e6237458be52931ee7e5abb0ce.tar
puppet-7b9c5195c61a61e6237458be52931ee7e5abb0ce.tar.gz
puppet-7b9c5195c61a61e6237458be52931ee7e5abb0ce.tar.bz2
puppet-7b9c5195c61a61e6237458be52931ee7e5abb0ce.tar.xz
puppet-7b9c5195c61a61e6237458be52931ee7e5abb0ce.zip
use same iurt command for both i586 and x86_64
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/upload.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 528fbfeb..4e4c15e7 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -15,7 +15,7 @@
iurt => {
user => 'iurt',
# (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
-# command => 'iurt --copy_srpm --group -v 1 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
+# command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
packages => '/home/iurt/iurt/',
log => '/home/iurt/iurt/',
@@ -29,7 +29,7 @@
($_ => {
iurt => {
user => 'iurt',
- command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ --additional-media -m __MEDIA__ -- file:///home/iurt_cache/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
+ command => 'iurt --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- http://repository/distrib/ -p \"__PACKAGER__\" -r __TARGET__ __ARCH__',
packages => '/home/iurt/iurt/',
log => '/home/iurt/iurt/',
},