Merge pull request #149 from bionix/add_wheezy_backports

[puppet-modules/puppetlabs-apt.git] / manifests / force.pp

diff --git a/manifests/force.pp b/manifests/force.pp
index d3d5962d0889a5975c81d62b8acd468015319ea2..2d33e942dcda0a7ddfd564d5d69be95e85a4afb1 100644 (file)
--- a/manifests/force.pp
+++ b/manifests/force.pp
@@ -3,7 +3,8 @@
 
 define apt::force(
   $release = 'testing',
-  $version = false
+  $version = false,
+  $timeout = 300
 ) {
 
   $version_string = $version ? {
@@ -15,8 +16,9 @@ define apt::force(
     false   => "/usr/bin/dpkg -s ${name} | grep -q 'Status: install'",
     default => "/usr/bin/dpkg -s ${name} | grep -q 'Version: ${version}'",
   }
-  exec { "/usr/bin/aptitude -y -t ${release} install ${name}${version_string}":
+  exec { "/usr/bin/apt-get -y -t ${release} install ${name}${version_string}":
     unless    => $install_check,
     logoutput => 'on_failure',
+    timeout   => $timeout,
   }
 }