aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-06 18:09:17 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-06 18:09:17 +0000
commitd6f5e30e1c5843a7644e79963950228cb04b4fb6 (patch)
treef82b0685c60cd797c2a8cd20d2ad2c7da841a8e4 /ruby
parent1d7fa3dd097834ee102a741b245b669cb3387661 (diff)
downloadpaludis-d6f5e30e1c5843a7644e79963950228cb04b4fb6.tar.gz
paludis-d6f5e30e1c5843a7644e79963950228cb04b4fb6.tar.xz
No need for PackageDepSpec::without_additional_requirements
Diffstat (limited to 'ruby')
-rw-r--r--ruby/dep_spec.cc18
-rw-r--r--ruby/dep_spec_TEST.rb10
2 files changed, 2 insertions, 26 deletions
diff --git a/ruby/dep_spec.cc b/ruby/dep_spec.cc
index d5205b048..12cc84564 100644
--- a/ruby/dep_spec.cc
+++ b/ruby/dep_spec.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
* Copyright (c) 2006, 2007, 2008 Richard Brown
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -595,21 +595,6 @@ namespace
/*
* call-seq:
- * without_additional_requirements -> PackageDepSpec
- *
- * Fetch us without our use requirements.
- */
- VALUE
- package_dep_spec_without_additional_requirements(VALUE self)
- {
- std::tr1::shared_ptr<WrappedSpecBase> * ptr;
- Data_Get_Struct(self, std::tr1::shared_ptr<WrappedSpecBase>, ptr);
- return package_dep_spec_to_value(std::tr1::static_pointer_cast<const WrappedSpec<PackageDepSpec> >(
- *ptr)->spec()->without_additional_requirements());
- }
-
- /*
- * call-seq:
* package -> QualifiedPackageName or Nil
*
* Fetch the package name.
@@ -1237,7 +1222,6 @@ namespace
#endif
rb_define_method(c_package_dep_spec, "tag", RUBY_FUNC_CAST(&package_dep_spec_tag), 0);
rb_define_method(c_package_dep_spec, "tag=", RUBY_FUNC_CAST(&package_dep_spec_set_tag), 1);
- rb_define_method(c_package_dep_spec, "without_additional_requirements", RUBY_FUNC_CAST(&package_dep_spec_without_additional_requirements), 0);
VALUE (* package_dep_spec_to_s) (VALUE) = &dep_spec_to_s<PackageDepSpec>;
rb_define_method(c_package_dep_spec, "to_s", RUBY_FUNC_CAST(package_dep_spec_to_s), 0);
diff --git a/ruby/dep_spec_TEST.rb b/ruby/dep_spec_TEST.rb
index 968e9a7f9..1ded8658e 100644
--- a/ruby/dep_spec_TEST.rb
+++ b/ruby/dep_spec_TEST.rb
@@ -1,7 +1,7 @@
#!/usr/bin/env ruby
# vim: set sw=4 sts=4 et tw=80 :
#
-# Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
# Copyright (c) 2007 Richard Brown
#
# This file is part of the Paludis package manager. Paludis is free software;
@@ -234,14 +234,6 @@ module Paludis
### assert_equal false, pda.use_requirements[1][:state]
### end
- def test_without_additional_requirements
- assert_equal ">=foo/bar-1:100::testrepo", pda.without_additional_requirements.to_s
- assert_equal "*/bar", pdb.without_additional_requirements.to_s
- assert_equal "foo/bar::installed?", pdc.without_additional_requirements.to_s
- assert_equal "foo/*::/??", pdd.without_additional_requirements.to_s
- assert_equal "foo/bar::testrepo->/mychroot", pde.without_additional_requirements.to_s
- end
-
def test_tag
assert_nil pda.tag
assert_nil pdb.tag