Andrew Bogott has submitted this change and it was merged.
Change subject: package-builder.pp: create aptcache dir
......................................................................
package-builder.pp: create aptcache dir
cowbuilder does not create the aptcache dir, create it just before
running the command.
Change-Id: I4b324ab40b218113966698475bfa048c33cd3adc
---
M manifests/misc/package-builder.pp
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/package-builder.pp
b/manifests/misc/package-builder.pp
index f078d6c..5427cb5 100644
--- a/manifests/misc/package-builder.pp
+++ b/manifests/misc/package-builder.pp
@@ -122,7 +122,8 @@
require packages
- $apt_cache = "--aptcache '${pbuilder_root}/aptcache'"
+ $apt_cache_dir = "${pbuilder_root}/aptcache"
+ $apt_cache = "--aptcache '${$apt_cache_dir}'"
$build_place = "--buildplace '${pbuilder_root}/build'"
case $realpbuilder {
'cowbuilder': {
@@ -148,7 +149,7 @@
$image_file = "${pbuilder_root}/${file_prefix}${realdist}.${file_ext}"
exec { "imaging ${realdist} for ${realpbuilder}":
- command => "${realpbuilder} ${apt_cache} ${build_place} --create
--distribution ${realdist} ${base_option} ${image_file} ${components}
${othermirror}",
+ command => "/bin/mkdir -p ${apt_cache_dir}; ${realpbuilder}
${apt_cache} ${build_place} --create --distribution ${realdist} ${base_option}
${image_file} ${components} ${othermirror}",
creates => $image_file,
path => '/bin:/sbin:/usr/bin:/usr/sbin',
timeout => 600,
--
To view, visit https://gerrit.wikimedia.org/r/121663
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b324ab40b218113966698475bfa048c33cd3adc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
