aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2010-11-24 00:27:43 +0000
committerOlivier Blin <blino@mageia.org>2010-11-24 00:27:43 +0000
commit127a6a2c8cc1610017d0d58e2a9f754648ae822a (patch)
tree32df292b326644c4a5f10f08158f52da168288f4 /modules/buildsystem
parent4ee5a69cfc7e7241ae53f75247824e2dc822bc18 (diff)
downloadpuppet-127a6a2c8cc1610017d0d58e2a9f754648ae822a.tar
puppet-127a6a2c8cc1610017d0d58e2a9f754648ae822a.tar.gz
puppet-127a6a2c8cc1610017d0d58e2a9f754648ae822a.tar.bz2
puppet-127a6a2c8cc1610017d0d58e2a9f754648ae822a.tar.xz
puppet-127a6a2c8cc1610017d0d58e2a9f754648ae822a.zip
extract homedir
Diffstat (limited to 'modules/buildsystem')
-rw-r--r--modules/buildsystem/templates/upload.conf9
1 files changed, 5 insertions, 4 deletions
diff --git a/modules/buildsystem/templates/upload.conf b/modules/buildsystem/templates/upload.conf
index 7b8531f0..053c2b4a 100644
--- a/modules/buildsystem/templates/upload.conf
+++ b/modules/buildsystem/templates/upload.conf
@@ -12,6 +12,7 @@ my %nodes = (
x86_64 => [ qw(jonund) ],
);
my $repository = "http://repository/distrib/";
+my $homedir = "/home/iurt";
{
bot => {
@@ -24,10 +25,10 @@ my $repository = "http://repository/distrib/";
iurt => {
user => 'iurt',
# (spuk, 2007-08-16) disabled iurt_cache additional media, locks trying to mount -o bind
-# command => "iurt --iurtlogdir __IURTLOGDIR__ --copy-srpm --group -v 6 --config local_spool /home/iurt/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository --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__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
- packages => '/home/iurt/iurt/',
- log => '/home/iurt/iurt/',
+# command => "iurt --iurtlogdir __IURTLOGDIR__ --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 --iurtlogdir __IURTLOGDIR__ --copy_srpm --group -v 6 --config local_spool $homedir/iurt/__DIR__ --no_rsync --chrooted-urpmi -m __MEDIA__ -- $repository -p \"__PACKAGER__\" -r __TARGET__ __ARCH__",
+ packages => '$homedir/iurt/',
+ log => '$homedir/iurt/',
},
});
} @{$nodes{$arch}},