Skip to content

Commit

Permalink
Fixed according to comments
Browse files Browse the repository at this point in the history
  • Loading branch information
kobliha committed Oct 17, 2013
1 parent 5a6707b commit 54ff34c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.1.0
3.1.1
1 change: 1 addition & 0 deletions package/yast2-installation.changes
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Tue Oct 15 14:15:31 CEST 2013 - locilka@suse.com

- Added support for ignore[d][_]feature[s] (FATE#314982) allowing
to skip some unwanted features of the installer
- 3.1.1

-------------------------------------------------------------------
Thu Oct 10 14:48:46 CEST 2013 - locilka@suse.com
Expand Down
2 changes: 1 addition & 1 deletion package/yast2-installation.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-installation
Version: 3.1.0
Version: 3.1.1
Release: 0

BuildRoot: %{_tmppath}/%{name}-%{version}-build
Expand Down
6 changes: 2 additions & 4 deletions src/modules/InstFunctions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,13 @@ def reset_ignored_features
# @param [String] feature_name
# @return [Boolean] whether it's ignored
def feature_ignored?(feature_name)
if (feature_name == nil)
if feature_name == nil
Builtins.y2warning("Undefined feature to check")
return false
end

ignored_features()

feature = feature_name.downcase.tr("-_", "")
@ignored_features.include?(feature)
ignored_features.include?(feature)
end

publish :function => :ignored_features, :type => "list ()"
Expand Down
4 changes: 2 additions & 2 deletions test/inst_functions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@

it "returns one feature set on commandline by one entry" do
linuxrc_commandline = "i-g-n-o-r-e_feature=fff"
ignored_features = ["fff"].sort
ignored_features = ["fff"]

Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
end

it "returns one feature set on commandline by one entry using up/down case" do
linuxrc_commandline = "Ignore_FeaTUres=ffF"
ignored_features = ["fff"].sort
ignored_features = ["fff"]

Yast::Linuxrc.stub(:InstallInf).and_return(linuxrc_commandline)
expect(Yast::InstFunctions.ignored_features.sort).to eq ignored_features
Expand Down

0 comments on commit 54ff34c

Please sign in to comment.