Skip to content

Commit

Permalink
minimalistic_configuration -> minimalistic_libzypp_config
Browse files Browse the repository at this point in the history
* It's a more self-descriptive name.
  • Loading branch information
imobachgs committed Jan 12, 2017
1 parent d2ca447 commit a64c579
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
6 changes: 3 additions & 3 deletions src/lib/packager/clients/pkg_finish.rb
Expand Up @@ -85,8 +85,8 @@ def write
# Patching /etc/zypp/zypp.conf in order not to install
# recommended packages, doc-packages,...
# (needed for products like CASP)
if ProductFeatures.GetBooleanFeature("software", "minimalistic_configuration")
set_minimalistic_zypp_conf
if ProductFeatures.GetBooleanFeature("software", "minimalistic_libzypp_config")
set_minimalistic_libzypp_conf
end

# copy list of failed packages to installed system
Expand Down Expand Up @@ -207,7 +207,7 @@ def sync_target_sources
# Set libzypp configuration to install the minimal amount of packages
#
# @see Yast::Packager::CFA::ZyppConf#set_minimalistic!
def set_minimalistic_zypp_conf
def set_minimalistic_libzypp_conf
config = Packager::CFA::ZyppConf.new
config.load
config.set_minimalistic!
Expand Down
9 changes: 5 additions & 4 deletions test/pkg_finish_test.rb
Expand Up @@ -17,13 +17,14 @@

subject(:client) { Yast::PkgFinishClient.new }
let(:repositories) { [] }
let(:minimalistic_configuration) { false }
let(:minimalistic_libzypp_config) { false }

before do
allow(Yast::WFM).to receive(:Args).and_return(args)
allow(::Packages::Repository).to receive(:enabled).and_return(repositories)
allow(Yast::ProductFeatures).to receive(:GetBooleanFeature).with("software", "minimalistic_configuration")
.and_return(minimalistic_configuration)
allow(Yast::ProductFeatures).to receive(:GetBooleanFeature)
.with("software", "minimalistic_libzypp_config")
.and_return(minimalistic_libzypp_config)
end

describe "Info" do
Expand Down Expand Up @@ -205,7 +206,7 @@
end

context "if libzypp's minimalistic configuration is enabled" do
let(:minimalistic_configuration) { true }
let(:minimalistic_libzypp_config) { true }

it "sets libzypp configuration to be minimalistic" do
expect(zypp_conf).to receive(:set_minimalistic!)
Expand Down

0 comments on commit a64c579

Please sign in to comment.