diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-09 18:29:44 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-10-09 18:29:44 +0000 |
| commit | 94484df1a8d00e0eae35cbe09c0e5d2ff4b16f49 (patch) | |
| tree | b6d0be5d0b9762274336665016d95f95935ea00e /lib/puppet/provider/package | |
| parent | 4a8c5dcb03af548d48972057387fd6810bead49e (diff) | |
| download | puppet-94484df1a8d00e0eae35cbe09c0e5d2ff4b16f49.tar.gz puppet-94484df1a8d00e0eae35cbe09c0e5d2ff4b16f49.tar.xz puppet-94484df1a8d00e0eae35cbe09c0e5d2ff4b16f49.zip | |
Applying patch from #234 from David Schmitt. This is also untested, and the patch is slightly modified.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1754 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/provider/package')
| -rwxr-xr-x | lib/puppet/provider/package/apt.rb | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb index 9c4478eba..5c6dc8916 100755 --- a/lib/puppet/provider/package/apt.rb +++ b/lib/puppet/provider/package/apt.rb @@ -41,6 +41,8 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do end end + attr_accessor :keepconfig + # Install a package using 'apt-get'. This function needs to support # installing a specific version. def install @@ -59,7 +61,18 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do # Add the package version str += "=%s" % should end - aptcmd("-q -y install %s" % str) + + keep = "" + if defined? @keepconfig + case @keepconfig + when true + keep = "-o 'DPkg::Options::=--force-confold'" + else + keep = "-o 'DPkg::Options::=--force-confnew'" + end + end + + aptcmd("-q -y %s install %s" % [keep, str]) end # What's the latest package version available? |
