aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-09 15:00:07 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-01-09 15:00:07 +0000
commit812e57e9e112dd949aadced0c2e0cdf22ad22c90 (patch)
tree54df41c8a175e2ca6c13d234f7f89b67f1f7f886
parent4231af5178d647d8ad932decfcf6a437bec63365 (diff)
downloadpaludis-812e57e9e112dd949aadced0c2e0cdf22ad22c90.tar.gz
paludis-812e57e9e112dd949aadced0c2e0cdf22ad22c90.tar.xz
nothing uses this
-rw-r--r--paludis/environments/test/test_environment.cc33
-rw-r--r--paludis/environments/test/test_environment.hh4
2 files changed, 2 insertions, 35 deletions
diff --git a/paludis/environments/test/test_environment.cc b/paludis/environments/test/test_environment.cc
index 8abf206..89351a6 100644
--- a/paludis/environments/test/test_environment.cc
+++ b/paludis/environments/test/test_environment.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -242,37 +242,6 @@ TestEnvironment::config_location_key() const
return std::tr1::shared_ptr<const MetadataValueKey<FSEntry> >();
}
-#if 0
-
-void
-TestEnvironment::add_set(const SetName & s, const std::string & members_str)
-{
- Context context("When adding set '" + stringify(s) + "' to test environment:");
-
- std::list<std::string> members;
- tokenise_whitespace(members_str, std::back_inserter(members));
-
- std::tr1::shared_ptr<ConstTreeSequence<SetSpecTree, AllDepSpec> > top(
- new ConstTreeSequence<SetSpecTree, AllDepSpec>(make_shared_ptr(new AllDepSpec)));
- for (std::list<std::string>::const_iterator m(members.begin()), m_end(members.end()) ;
- m != m_end ; ++m)
- {
- try
- {
- top->add(make_shared_ptr(new TreeLeaf<SetSpecTree, PackageDepSpec>(make_shared_ptr(new PackageDepSpec(
- parse_user_package_dep_spec(*m, this, UserPackageDepSpecOptions() + updso_throw_if_set + updso_no_disambiguation))))));
- }
- catch (const GotASetNotAPackageDepSpec &)
- {
- top->add(make_shared_ptr(new TreeLeaf<SetSpecTree, NamedSetDepSpec>(make_shared_ptr(new NamedSetDepSpec(SetName(*m))))));
- }
- }
-
- _imp->sets[s] = top;
-}
-
-#endif
-
const Tribool
TestEnvironment::want_choice_enabled(
const std::tr1::shared_ptr<const PackageID> & id,
diff --git a/paludis/environments/test/test_environment.hh b/paludis/environments/test/test_environment.hh
index b0dfe21..fc63318 100644
--- a/paludis/environments/test/test_environment.hh
+++ b/paludis/environments/test/test_environment.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006, 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2005, 2006, 2007, 2008, 2009 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -124,8 +124,6 @@ namespace paludis
virtual const std::tr1::shared_ptr<const MetadataValueKey<std::string> > format_key() const;
virtual const std::tr1::shared_ptr<const MetadataValueKey<FSEntry> > config_location_key() const;
- void add_set(const SetName &, const std::string &);
-
virtual const Tribool want_choice_enabled(
const std::tr1::shared_ptr<const PackageID> &,
const std::tr1::shared_ptr<const Choice> &,