aboutsummaryrefslogtreecommitdiff
path: root/ruby
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-09 14:07:05 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-03-09 14:07:05 +0000
commita297ce7c92fc48b2e5f7df4a2624c25ddab3b81d (patch)
treef3d4c5c11709d26bebdf0e7e424b569dcd992253 /ruby
parent410f8b38e6bb0feb13e2d5e5c3ac34c4e87c0fee (diff)
downloadpaludis-a297ce7c92fc48b2e5f7df4a2624c25ddab3b81d.tar.gz
paludis-a297ce7c92fc48b2e5f7df4a2624c25ddab3b81d.tar.xz
world is now in env, not repos. Fixes: ticket:421
Diffstat (limited to 'ruby')
-rwxr-xr-xruby/action_TEST_setup.sh4
-rwxr-xr-xruby/dep_list_TEST_setup.sh4
-rwxr-xr-xruby/dep_spec_TEST_setup.sh4
-rwxr-xr-xruby/dep_tag_TEST_setup.sh4
-rwxr-xr-xruby/environment_TEST_setup.sh4
-rwxr-xr-xruby/package_database_TEST_setup.sh4
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh6
-rw-r--r--ruby/repository.cc9
-rw-r--r--ruby/repository_TEST.rb2
-rwxr-xr-xruby/repository_TEST_setup.sh4
10 files changed, 34 insertions, 11 deletions
diff --git a/ruby/action_TEST_setup.sh b/ruby/action_TEST_setup.sh
index 2611b94..2a2fc91 100755
--- a/ruby/action_TEST_setup.sh
+++ b/ruby/action_TEST_setup.sh
@@ -35,6 +35,10 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1
diff --git a/ruby/dep_list_TEST_setup.sh b/ruby/dep_list_TEST_setup.sh
index bdd939d..c2c1689 100755
--- a/ruby/dep_list_TEST_setup.sh
+++ b/ruby/dep_list_TEST_setup.sh
@@ -39,6 +39,10 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
diff --git a/ruby/dep_spec_TEST_setup.sh b/ruby/dep_spec_TEST_setup.sh
index 02d2b3a..9f90744 100755
--- a/ruby/dep_spec_TEST_setup.sh
+++ b/ruby/dep_spec_TEST_setup.sh
@@ -14,6 +14,10 @@ cache = /var/empty
profiles = \${location}/profiles/testprofile
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files,bar/foo/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
diff --git a/ruby/dep_tag_TEST_setup.sh b/ruby/dep_tag_TEST_setup.sh
index af9a8dd..738fd96 100755
--- a/ruby/dep_tag_TEST_setup.sh
+++ b/ruby/dep_tag_TEST_setup.sh
@@ -14,6 +14,10 @@ cache = /var/empty
profiles = \${location}/profiles/testprofile
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
diff --git a/ruby/environment_TEST_setup.sh b/ruby/environment_TEST_setup.sh
index 1ee52e1..12c0f5d 100755
--- a/ruby/environment_TEST_setup.sh
+++ b/ruby/environment_TEST_setup.sh
@@ -37,6 +37,10 @@ foo/bar GPL-2
foo/baz *
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files,foo/baz/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
diff --git a/ruby/package_database_TEST_setup.sh b/ruby/package_database_TEST_setup.sh
index 9182e80..5cc400a 100755
--- a/ruby/package_database_TEST_setup.sh
+++ b/ruby/package_database_TEST_setup.sh
@@ -28,6 +28,10 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files,foo/baz/files,quux/baz/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index 4897c83..13b07dd 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -35,6 +35,10 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
+cat <<END > home/.paludis/environment.conf
+world = `pwd`/world
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1
echo "testrepo" > profiles/repo_name || exit 1
@@ -73,6 +77,6 @@ cd ..
mkdir -p installed || exit 1
-echo "foo/bar" > installed/world
+echo "foo/bar" > world
diff --git a/ruby/repository.cc b/ruby/repository.cc
index 537e2bf..6c54699 100644
--- a/ruby/repository.cc
+++ b/ruby/repository.cc
@@ -330,14 +330,6 @@ namespace
* Returns self if the repository supports the interface, otherwise Nil.
*/
/*
- * Document-method: world_interface
- *
- * call-seq:
- * world_interface -> self or Nil
- *
- * Returns self if the repository supports the interface, otherwise Nil.
- */
- /*
* Document-method: mirrors_interface
*
* call-seq:
@@ -928,7 +920,6 @@ namespace
rb_define_method(c_repository, "sets_interface", RUBY_FUNC_CAST((&Interface< k::sets_interface>::fetch)), 0);
rb_define_method(c_repository, "syncable_interface", RUBY_FUNC_CAST((&Interface< k::syncable_interface>::fetch)), 0);
rb_define_method(c_repository, "use_interface", RUBY_FUNC_CAST((&Interface< k::use_interface>::fetch)), 0);
- rb_define_method(c_repository, "world_interface", RUBY_FUNC_CAST((&Interface< k::world_interface>::fetch)), 0);
rb_define_method(c_repository, "mirrors_interface", RUBY_FUNC_CAST((&Interface< k::mirrors_interface>::fetch)), 0);
rb_define_method(c_repository, "environment_variable_interface", RUBY_FUNC_CAST((&Interface<
k::environment_variable_interface>::fetch)), 0);
diff --git a/ruby/repository_TEST.rb b/ruby/repository_TEST.rb
index 94e7662..f1416c7 100644
--- a/ruby/repository_TEST.rb
+++ b/ruby/repository_TEST.rb
@@ -170,7 +170,7 @@ module Paludis
def test_responds
repo = no_config_testrepo.main_repository
[:sets_interface, :syncable_interface, :use_interface,
- :world_interface, :mirrors_interface, :environment_variable_interface,
+ :mirrors_interface, :environment_variable_interface,
:provides_interface, :virtuals_interface, :e_interface,
:qa_interface].each do |sym|
assert_respond_to repo, sym
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index d16e4ef..1ba3472 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -35,6 +35,10 @@ cat <<END > home/.paludis/licenses.conf
*/* *
END
+cat <<END > home/.paludis/environment.conf
+world = /dev/null
+END
+
mkdir -p testrepo/{eclass,distfiles,profiles/testprofile,foo/bar/files} || exit 1
cd testrepo || exit 1