Merge pull request #422 from mysociety/install-package-before-dirs

Lennart Betz · web-flow · commit 0c5e2edd454a · 2024-09-04T07:06:38.000+02:00
Install: Ensure package installed before file resources
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -26,6 +26,9 @@
     package { $package_name:
       ensure => installed,
     }
+    File {
+      require => Package[$package_name],
+    }
   }
 
   if $extra_packages {
@@ -71,7 +74,7 @@
     mode   => '0755',
   }
 
-  exec { 'link old db schema directory for compatibility':
+  -> exec { 'link old db schema directory for compatibility':
     path    => $facts['path'],
     command => "ln -s ${data_dir}/schema ${comp_dir}/schema",
     unless  => "stat ${comp_dir}/schema",

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@`
`26`	`26`	`package { $package_name:`
`27`	`27`	`ensure => installed,`
`28`	`28`	`}`
	`29`	`+ File {`
	`30`	`+ require => Package[$package_name],`
	`31`	`+ }`
`29`	`32`	`}`
`30`	`33`
`31`	`34`	`if $extra_packages {`
`@@ -71,7 +74,7 @@`
`71`	`74`	`mode => '0755',`
`72`	`75`	`}`
`73`	`76`
`74`		`- exec { 'link old db schema directory for compatibility':`
	`77`	`+ -> exec { 'link old db schema directory for compatibility':`
`75`	`78`	`path => $facts['path'],`
`76`	`79`	`command => "ln -s ${data_dir}/schema ${comp_dir}/schema",`
`77`	`80`	`unless => "stat ${comp_dir}/schema",`