Merge pull request #9 from mmoll/concat

allow newer puppetlabs-concat
voxpupuli · Jun 27, 2017 · 1f20156 · 1f20156
2 parents 28afa10 + a1206bf
commit 1f20156
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/manifests/cowbuilder.pp b/manifests/cowbuilder.pp
@@ -16,7 +16,6 @@
     owner   => root,
     group   => root,
     mode    => '0644',
-    force   => true,
     require => Package['pbuilder'],
   }
 
@@ -35,7 +34,6 @@
           ensure  => directory,
           recurse => true,
           purge   => true,
-          force   => true,
           require => File["${confdir}/${name}/apt"];
 
         "${confdir}/${name}/pbuilderrc":

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -151,17 +151,15 @@
           [ $aptconfdir, $builddir, $resultdir, $aptcachedir ]:
             ensure  => absent,
             require => Exec["clean_pbuilder_${name}"],
-            recurse => true,
-            force   => true;
+            recurse => true;
           # recursively remove containing directories
           [ $pbuilder_confdir, $pbuilder_cachedir ]:
             ensure  => absent,
             require => [ Exec["clean_pbuilder_${name}"],
             File[$script], File[$pbuilderrc],
             File[$aptconfdir],
             File[$builddir], File[$resultdir], File[$aptcachedir]
-            ],
-            force   => true;
+            ];
       }
     }
 

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/concat",
-      "version_requirement": ">=1.1.0 <1.2.0"
+      "version_requirement": ">=1.1.0 <5.0.0"
     },
     {
       "name": "puppetlabs/stdlib",