diff options
author | 2011-04-04 09:23:47 +0100 | |
---|---|---|
committer | 2011-04-04 09:23:47 +0100 | |
commit | 83be9aeb5b6ce424eda8f901c3418e0db2cbac95 (patch) | |
tree | 426b591aea646580b87995ce26659508eef5dea5 /ruby | |
parent | 658a603da143398c3fbf3db3d335ffc92bb7cbb5 (diff) | |
download | paludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.gz paludis-83be9aeb5b6ce424eda8f901c3418e0db2cbac95.tar.xz |
Betterer names
Diffstat (limited to 'ruby')
-rw-r--r-- | ruby/generator_TEST.rb | 4 | ||||
-rw-r--r-- | ruby/paludis_ruby.cc | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ruby/generator_TEST.rb b/ruby/generator_TEST.rb index 7b91c0820..ffef5d0c3 100644 --- a/ruby/generator_TEST.rb +++ b/ruby/generator_TEST.rb @@ -59,8 +59,8 @@ module Paludis assert_equal Generator::Matches.new(Paludis::parse_user_package_dep_spec("a/b", env, []), nil, []).to_s, "packages matching a/b" assert_equal Generator::Matches.new(Paludis::parse_user_package_dep_spec("a/b", env, []), - nil, [:ignore_additional_requirements]).to_s, - "packages matching a/b (ignoring additional requirements)" + nil, [:ignore_choice_constraints]).to_s, + "packages matching a/b (ignoring choice constraints)" end end diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc index cf749d216..7ce44f23b 100644 --- a/ruby/paludis_ruby.cc +++ b/ruby/paludis_ruby.cc @@ -384,8 +384,8 @@ paludis::ruby::value_to_match_package_options(VALUE v) { VALUE entry(rb_ary_entry(v, i)); Check_Type(entry, T_SYMBOL); - if (SYM2ID(entry) == rb_intern("ignore_additional_requirements")) - o += mpo_ignore_additional_requirements; + if (SYM2ID(entry) == rb_intern("ignore_choice_constraints")) + o += mpo_ignore_choice_constraints; else rb_raise(rb_eArgError, "Unknown MatchPackageOptions option '%s'", rb_obj_as_string(entry)); } @@ -396,8 +396,8 @@ VALUE paludis::ruby::match_package_options_to_value(const MatchPackageOptions & o) { VALUE a(rb_ary_new()); - if (o[mpo_ignore_additional_requirements]) - rb_ary_push(a, ID2SYM(rb_intern("ignore_additional_requirements"))); + if (o[mpo_ignore_choice_constraints]) + rb_ary_push(a, ID2SYM(rb_intern("ignore_choice_constraints"))); return a; } |