aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-18 20:16:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-03-18 20:16:51 +0000
commita49d3cfd8e98328400f60a4b7f064021574f1a73 (patch)
tree60124bfc9851d11530d398f20bc5eee2893a9927
parentd2eb3cd9f4b5e7fbf757e6101fe0d40a91d5f990 (diff)
downloadpaludis-a49d3cfd8e98328400f60a4b7f064021574f1a73.tar.gz
paludis-a49d3cfd8e98328400f60a4b7f064021574f1a73.tar.xz
Remove NoConfigEnvironment::set_accept_unstable
-rw-r--r--paludis/environments/no_config/no_config_environment.cc10
-rw-r--r--paludis/environments/no_config/no_config_environment.hh5
-rw-r--r--python/environment.cc5
-rwxr-xr-xpython/environment_TEST.py4
-rw-r--r--ruby/environment.cc14
-rw-r--r--ruby/environment_TEST.rb14
6 files changed, 0 insertions, 52 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 07ecaa7..aa308c4 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -387,16 +387,6 @@ NoConfigEnvironment::main_repository_dir() const
return _imp->top_level_dir;
}
-void
-NoConfigEnvironment::set_accept_unstable(const bool value)
-{
- _imp->accept_unstable = value;
- for (PackageDatabase::RepositoryConstIterator it(_imp->package_database->begin_repositories()),
- it_end(_imp->package_database->end_repositories());
- it_end != it; ++it)
- (*it)->invalidate_masks();
-}
-
std::shared_ptr<Repository>
NoConfigEnvironment::main_repository()
{
diff --git a/paludis/environments/no_config/no_config_environment.hh b/paludis/environments/no_config/no_config_environment.hh
index 575927a..f261b53 100644
--- a/paludis/environments/no_config/no_config_environment.hh
+++ b/paludis/environments/no_config/no_config_environment.hh
@@ -110,11 +110,6 @@ namespace paludis
*/
FSPath main_repository_dir() const;
- /**
- * Should we accept unstable keywords?
- */
- void set_accept_unstable(const bool value);
-
///\}
///\name NoConfigEnvironment-specific repository information
diff --git a/python/environment.cc b/python/environment.cc
index 5e5bd3c..1c2ed90 100644
--- a/python/environment.cc
+++ b/python/environment.cc
@@ -707,11 +707,6 @@ void expose_environment()
"[ro] Repository\n"
"Master repository."
)
-
- .add_property("accept_unstable", bp::object(), &NoConfigEnvironment::set_accept_unstable,
- "[wo] bool\n"
- "Should we accept unstable keywords?"
- )
;
/**
diff --git a/python/environment_TEST.py b/python/environment_TEST.py
index 8b94905..54086c8 100755
--- a/python/environment_TEST.py
+++ b/python/environment_TEST.py
@@ -70,10 +70,6 @@ class TestCase_01_Environments(unittest.TestCase):
self.assert_(isinstance(nce2.main_repository, Repository))
self.assert_(isinstance(nce2.master_repository, Repository))
- def test_11_set_accept_unstable(self):
- self.nce.accept_unstable = True
- self.assertRaises(AttributeError, lambda: self.nce.accept_unstable)
-
def test_12_config_dir(self):
self.assert_(isinstance(self.e.config_dir, str))
diff --git a/ruby/environment.cc b/ruby/environment.cc
index 8d9d9b8..6f86ab0 100644
--- a/ruby/environment.cc
+++ b/ruby/environment.cc
@@ -415,19 +415,6 @@ namespace
/*
* call-seq:
- * accept_unstable=(true or false)
- *
- * Should we accept unstable keywords?
- */
- VALUE
- no_config_environment_set_accept_unstable(VALUE self, VALUE unstable)
- {
- value_to_no_config_environment(self)->set_accept_unstable(!(Qfalse == unstable || Qnil == unstable));
- return Qnil;
- }
-
- /*
- * call-seq:
* create(spec) -> Environment
*
* Create an environment from the given spec.
@@ -498,7 +485,6 @@ namespace
rb_define_method(c_no_config_environment, "initialize", RUBY_FUNC_CAST(&no_config_environment_init), -1);
rb_define_method(c_no_config_environment, "main_repository", RUBY_FUNC_CAST(&no_config_environment_main_repository), 0);
rb_define_method(c_no_config_environment, "master_repository", RUBY_FUNC_CAST(&no_config_environment_master_repository), 0);
- rb_define_method(c_no_config_environment, "accept_unstable=", RUBY_FUNC_CAST(&no_config_environment_set_accept_unstable), 1);
/*
* Document-class: Paludis::TestEnvironment
diff --git a/ruby/environment_TEST.rb b/ruby/environment_TEST.rb
index 9da0eb1..536850d 100644
--- a/ruby/environment_TEST.rb
+++ b/ruby/environment_TEST.rb
@@ -230,20 +230,6 @@ module Paludis
end
end
- class TestCase_EnvironmentSetAcceptUnstable < Test::Unit::TestCase
- def env
- NoConfigEnvironment.new(Dir.getwd().to_s + "/environment_TEST_dir/testrepo")
- end
-
- def test_set_accept_unstable
- assert_respond_to env, :accept_unstable=
- assert_nothing_raised do
- env.accept_unstable=true
- env.accept_unstable=false
- end
- end
- end
-
class TestCase_EnvironmentMirrors < Test::Unit::TestCase
def env
@env or @env = EnvironmentFactory.instance.create("")