Merge pull request voxpupuli#490 from SearchLightNZ/fix_requirements_subscribe

bastelfreak · web-flow · commit 374abf8d2deb · 2019-05-30T14:39:59.000+02:00
Fix $subscribe overloading
diff --git a/manifests/requirements.pp b/manifests/requirements.pp
@@ -89,9 +89,9 @@
       replace => false,
       content => '# Puppet will install and/or update pip packages listed here',
     }
-    $subscribe = File[$requirements]
+    $local_subscribe = File[$requirements]
   } else {
-    $subscribe = undef
+    $local_subscribe = undef
   }
 
   exec { "python_requirements${name}":
@@ -101,7 +101,7 @@
     timeout     => $timeout,
     cwd         => $cwd,
     user        => $owner,
-    subscribe   => $subscribe,
+    subscribe   => $local_subscribe,
     environment => $environment,
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,9 @@`
`89`	`89`	`replace => false,`
`90`	`90`	`content => '# Puppet will install and/or update pip packages listed here',`
`91`	`91`	`}`
`92`		`- $subscribe = File[$requirements]`
	`92`	`+ $local_subscribe = File[$requirements]`
`93`	`93`	`} else {`
`94`		`- $subscribe = undef`
	`94`	`+ $local_subscribe = undef`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`exec { "python_requirements${name}":`
`@@ -101,7 +101,7 @@`
`101`	`101`	`timeout => $timeout,`
`102`	`102`	`cwd => $cwd,`
`103`	`103`	`user => $owner,`
`104`		`- subscribe => $subscribe,`
	`104`	`+ subscribe => $local_subscribe,`
`105`	`105`	`environment => $environment,`
`106`	`106`	`}`
`107`	`107`	`}`