diff options
author | Eike Waldt <waldt@b1-systems.de> | 2016-09-29 15:37:25 +0200 |
---|---|---|
committer | Eike Waldt <waldt@b1-systems.de> | 2016-09-29 15:37:25 +0200 |
commit | effd1535c014a0eec157273c1225659d7b033c7b (patch) | |
tree | c70f575e07782c80483a986b70b0b334eaff477b | |
parent | 7eb563f8d1dc63bf9f5f1e94e38c3750db743b11 (diff) | |
download | chef-effd1535c014a0eec157273c1225659d7b033c7b.tar.gz |
fixed apt-mark commands
-rw-r--r-- | lib/chef/provider/package/apt.rb | 4 | ||||
-rw-r--r-- | spec/unit/provider/package/apt_spec.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb index 42950884df..1c8ed8bc94 100644 --- a/lib/chef/provider/package/apt.rb +++ b/lib/chef/provider/package/apt.rb @@ -118,11 +118,11 @@ class Chef end def lock_package(name, version) - run_noninteractive("apt-mark -q -y", new_resource.options, "hold", name) + run_noninteractive("apt-mark", new_resource.options, "hold", name) end def unlock_package(name, version) - run_noninteractive("apt-mark -q -y", new_resource.options, "unhold", name) + run_noninteractive("apt-mark", new_resource.options, "unhold", name) end private diff --git a/spec/unit/provider/package/apt_spec.rb b/spec/unit/provider/package/apt_spec.rb index 9a391c0d88..cf31c3d7cc 100644 --- a/spec/unit/provider/package/apt_spec.rb +++ b/spec/unit/provider/package/apt_spec.rb @@ -398,7 +398,7 @@ mpg123 1.12.1-0ubuntu1 describe "when locking a package" do it "should run apt-mark hold package" do expect(@provider).to receive(:shell_out!).with( - "apt-mark -q -y hold irssi", + "apt-mark hold irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive" }, :timeout => @timeout ) @@ -409,7 +409,7 @@ mpg123 1.12.1-0ubuntu1 describe "when unlocking a package" do it "should run apt-mark unhold package" do expect(@provider).to receive(:shell_out!).with( - "apt-mark -q -y unhold irssi", + "apt-mark unhold irssi", :env => { "DEBIAN_FRONTEND" => "noninteractive" }, :timeout => @timeout ) |