aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-21 14:06:55 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-21 14:47:29 +0100
commitfce0d31f523337cf01b26ed4f6059204a38a702a (patch)
treed003995fe2c3409f9681f97432b9e7a16e3dc0e4
parenta5d2a831ee32cb5fa1c111c4a9d1f21dbe7c7a3c (diff)
downloadpaludis-fce0d31f523337cf01b26ed4f6059204a38a702a.tar.gz
paludis-fce0d31f523337cf01b26ed4f6059204a38a702a.tar.xz
format=e rather than format=ebuild/exheres
-rwxr-xr-xhooks/news_TEST_setup.sh6
-rw-r--r--paludis/environments/no_config/no_config_environment.cc2
-rwxr-xr-xpaludis/environments/paludis/paludis_environment_TEST_setup.sh18
-rw-r--r--paludis/environments/portage/portage_environment.cc2
-rw-r--r--paludis/repositories/e/depend_rdepend_TEST.cc2
-rw-r--r--paludis/repositories/e/e_installed_repository.cc2
-rw-r--r--paludis/repositories/e/e_repository.cc14
-rw-r--r--paludis/repositories/e/e_repository_TEST.cc42
-rw-r--r--paludis/repositories/e/e_repository_TEST_0.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_1.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_2.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_3.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_4.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_ever.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exlibs.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_pbin.cc4
-rw-r--r--paludis/repositories/e/e_repository_TEST_phases.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_replacing.cc2
-rw-r--r--paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc2
-rw-r--r--paludis/repositories/e/e_repository_sets_TEST.cc8
-rw-r--r--paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc88
-rw-r--r--paludis/repositories/e/exndbam_repository_TEST.cc2
-rw-r--r--paludis/repositories/e/registration.cc3
-rw-r--r--paludis/repositories/e/vdb_repository_TEST.cc16
-rw-r--r--paludis/resolver/resolver_test.cc2
-rwxr-xr-xpython/dep_list_TEST_setup.sh2
-rwxr-xr-xpython/environment_TEST_setup.sh2
-rwxr-xr-xpython/mask_TEST_setup.sh2
-rwxr-xr-xpython/package_database_TEST_setup.sh2
-rwxr-xr-xpython/repository_TEST.py2
-rwxr-xr-xpython/repository_TEST_setup.sh2
-rwxr-xr-xruby/action_TEST_setup.sh2
-rwxr-xr-xruby/dep_list_TEST_setup.sh2
-rwxr-xr-xruby/dep_spec_TEST_setup.sh2
-rwxr-xr-xruby/dep_tag_TEST_setup.sh2
-rwxr-xr-xruby/environment_TEST_setup.sh2
-rwxr-xr-xruby/generator_TEST_setup.sh2
-rwxr-xr-xruby/package_database_TEST_setup.sh2
-rwxr-xr-xruby/paludis_ruby_TEST_setup.sh2
-rw-r--r--ruby/repository_TEST.rb4
-rwxr-xr-xruby/repository_TEST_setup.sh2
-rwxr-xr-xsrc/clients/cave/continue_on_failure_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/continue_on_failure_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/install_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/pretend_TEST_setup.sh2
-rwxr-xr-xsrc/clients/paludis/upgrade_TEST_setup.sh2
48 files changed, 140 insertions, 141 deletions
diff --git a/hooks/news_TEST_setup.sh b/hooks/news_TEST_setup.sh
index 48f06bc..5925060 100755
--- a/hooks/news_TEST_setup.sh
+++ b/hooks/news_TEST_setup.sh
@@ -9,7 +9,7 @@ mkdir -p one/.paludis/repositories/ || exit 1
cat <<END > one/.paludis/repositories/one.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
END
@@ -19,7 +19,7 @@ mkdir -p two/.paludis/repositories/ || exit 1
cat <<END > two/.paludis/repositories/one.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
END
@@ -27,7 +27,7 @@ END
cat <<END > two/.paludis/repositories/two.conf
location = `pwd`/repo2
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
END
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index fb66ed9..721dee3 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.cc
@@ -209,7 +209,7 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
if (params.extra_params())
std::copy(params.extra_params()->begin(), params.extra_params()->end(), keys->inserter());
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("location", stringify(r->first.realpath()));
keys->insert("profiles", params.profiles_if_not_auto().empty() ? "(auto)" : params.profiles_if_not_auto());
keys->insert("ignore_deprecated_profiles", "true");
diff --git a/paludis/environments/paludis/paludis_environment_TEST_setup.sh b/paludis/environments/paludis/paludis_environment_TEST_setup.sh
index df5b2e2..9d684d1 100755
--- a/paludis/environments/paludis/paludis_environment_TEST_setup.sh
+++ b/paludis/environments/paludis/paludis_environment_TEST_setup.sh
@@ -108,7 +108,7 @@ cat <<END > home1/.paludis/licenses.conf
*/* keyword "quoted keyword"
END
cat <<END > home1/.paludis/repositories/foo.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
@@ -128,7 +128,7 @@ cat <<END > home2/.paludis/licenses.conf
*/* *
END
cat <<END > home2/.paludis/repositories/foo.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
@@ -148,7 +148,7 @@ cat <<END > home3/.paludis/licenses.conf
*/* *
END
cat <<END > home3/.paludis/repositories/foo.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/repo
profiles = `pwd`/repo/profile
@@ -166,7 +166,7 @@ cat <<END > home4/.paludis/licenses.conf
*/* *
END
cat <<END > home4/.paludis/repositories/first.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/firstrepo
profiles = `pwd`/repo/profile
@@ -175,7 +175,7 @@ master_repository = second
importance = 20
END
cat <<END > home4/.paludis/repositories/second.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/secondrepo
profiles = `pwd`/repo/profile
@@ -183,7 +183,7 @@ cache = /var/empty
importance = 10
END
cat <<END > home4/.paludis/repositories/third.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/thirdrepo
profiles = `pwd`/repo/profile
@@ -192,7 +192,7 @@ master_repository = second
importance = 8
END
cat <<END > home4/.paludis/repositories/fourth.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/fourthrepo
profiles = `pwd`/repo/profile
@@ -200,7 +200,7 @@ cache = /var/empty
importance = 12
END
cat <<END > home4/.paludis/repositories/fifth.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/fifthrepo
profiles = `pwd`/repo/profile
@@ -221,7 +221,7 @@ cat <<END > home5/.paludis/licenses.conf
*/* *
END
cat <<END > home5/.paludis/repositories/foo.conf
-format = ebuild
+format = e
names_cache = /var/empty
location = `pwd`/sixthrepo
profiles = `pwd`/sixthrepo/profile
diff --git a/paludis/environments/portage/portage_environment.cc b/paludis/environments/portage/portage_environment.cc
index 6a79b2f..a2c2b1a 100644
--- a/paludis/environments/portage/portage_environment.cc
+++ b/paludis/environments/portage/portage_environment.cc
@@ -489,7 +489,7 @@ PortageEnvironment::_add_ebuild_repository(const FSEntry & portdir, const std::s
keys->insert("profiles", stringify((_imp->conf_dir / "make.profile").realpath()) + " " +
((_imp->conf_dir / "portage" / "profile").is_directory() ?
stringify(_imp->conf_dir / "portage" / "profile") : ""));
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("master_repository", master);
keys->insert("sync", sync);
diff --git a/paludis/repositories/e/depend_rdepend_TEST.cc b/paludis/repositories/e/depend_rdepend_TEST.cc
index 5646c03..29c774a 100644
--- a/paludis/repositories/e/depend_rdepend_TEST.cc
+++ b/paludis/repositories/e/depend_rdepend_TEST.cc
@@ -109,7 +109,7 @@ namespace
FSEntry root(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "root");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "depend_rdepend_TEST_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_installed_repository.cc b/paludis/repositories/e/e_installed_repository.cc
index 33f162d..f3f8b8b 100644
--- a/paludis/repositories/e/e_installed_repository.cc
+++ b/paludis/repositories/e/e_installed_repository.cc
@@ -135,7 +135,7 @@ bool
EInstalledRepository::is_suitable_destination_for(const PackageID & e) const
{
std::string f(e.repository()->format_key() ? e.repository()->format_key()->value() : "");
- return f == "ebuild" || f == "exheres" || f == "portage";
+ return f == "e" || f == "ebuild" || f == "exheres" || f == "portage";
}
bool
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 45db13a..94bc2bc 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -967,7 +967,7 @@ bool
ERepository::is_suitable_destination_for(const PackageID & e) const
{
std::string f(e.repository()->format_key() ? e.repository()->format_key()->value() : "");
- if (f == "ebuild")
+ if (f == "e")
return static_cast<const ERepositoryID &>(e).eapi()->supported()->can_be_pbin();
else
return false;
@@ -1250,9 +1250,8 @@ ERepository::repository_factory_create(
if (master_repository_uncasted->format_key())
format = master_repository_uncasted->format_key()->value();
- if (format != "ebuild")
- throw ERepositoryConfigurationError("Master repository format is '" +
- stringify(format) + "', not 'ebuild'");
+ if (format != "e")
+ throw ERepositoryConfigurationError("Master repository format is '" + stringify(format) + "', not 'ebuild'");
std::tr1::shared_ptr<ERepository> master_repository(std::tr1::static_pointer_cast<ERepository>(master_repository_uncasted));
master_repositories.reset(new ERepositorySequence);
@@ -1277,9 +1276,8 @@ ERepository::repository_factory_create(
if (master_repository_uncasted->format_key())
format = master_repository_uncasted->format_key()->value();
- if (format != "ebuild")
- throw ERepositoryConfigurationError("Master repository format is '" +
- stringify(format) + "', not 'ebuild'");
+ if (format != "e")
+ throw ERepositoryConfigurationError("Master repository format is '" + stringify(format) + "', not 'ebuild'");
std::tr1::shared_ptr<ERepository> master_repository(std::tr1::static_pointer_cast<ERepository>(master_repository_uncasted));
if (! master_repositories)
@@ -1512,7 +1510,7 @@ ERepository::repository_factory_create(
n::eapi_when_unknown() = eapi_when_unknown,
n::eapi_when_unspecified() = eapi_when_unspecified,
n::eclassdirs() = eclassdirs,
- n::entry_format() = "ebuild",
+ n::entry_format() = "e",
n::environment() = env,
n::ignore_deprecated_profiles() = ignore_deprecated_profiles,
n::layout() = layout,
diff --git a/paludis/repositories/e/e_repository_TEST.cc b/paludis/repositories/e/e_repository_TEST.cc
index dfe9fd3..26c3acf 100644
--- a/paludis/repositories/e/e_repository_TEST.cc
+++ b/paludis/repositories/e/e_repository_TEST.cc
@@ -100,7 +100,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
@@ -120,7 +120,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo2"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo2/profiles/profile"));
@@ -140,7 +140,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo3"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo3/profiles/profile"));
@@ -160,7 +160,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
@@ -189,7 +189,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo1/profiles/profile"));
@@ -220,7 +220,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
@@ -257,7 +257,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
@@ -298,7 +298,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
@@ -348,7 +348,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo5"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo5/profiles/profile"));
@@ -382,7 +382,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo4/profiles/profile"));
@@ -427,7 +427,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo8"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo8/profiles/profile"));
@@ -480,7 +480,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("write_cache", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7/metadata/cache"));
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7"));
@@ -563,7 +563,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo7/profiles/profile"));
@@ -608,7 +608,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo9"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo9/profiles/child"));
@@ -690,7 +690,7 @@ namespace test_cases
std::tr1::shared_ptr<Map<std::string, std::string> > keys18(
new Map<std::string, std::string>);
- keys18->insert("format", "ebuild");
+ keys18->insert("format", "e");
keys18->insert("names_cache", "/var/empty");
keys18->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo18"));
keys18->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo18/profiles/profile"));
@@ -701,7 +701,7 @@ namespace test_cases
std::tr1::shared_ptr<Map<std::string, std::string> > keys19(
new Map<std::string, std::string>);
- keys19->insert("format", "ebuild");
+ keys19->insert("format", "e");
keys19->insert("names_cache", "/var/empty");
keys19->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo19"));
keys19->insert("master_repository", "test-repo-18");
@@ -748,7 +748,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo10"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo10/profiles/profile/subprofile"));
@@ -784,7 +784,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15/profiles/profile"));
@@ -827,7 +827,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo15/profiles/profile/subprofile"));
@@ -876,7 +876,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11/profiles/profile"));
@@ -1035,7 +1035,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dir" / "repo11/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_0.cc b/paludis/repositories/e/e_repository_TEST_0.cc
index 7488551..acd9d3b 100644
--- a/paludis/repositories/e/e_repository_TEST_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_0.cc
@@ -113,7 +113,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_0_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_0_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_1.cc b/paludis/repositories/e/e_repository_TEST_1.cc
index ac6f558..1334e7d 100644
--- a/paludis/repositories/e/e_repository_TEST_1.cc
+++ b/paludis/repositories/e/e_repository_TEST_1.cc
@@ -106,7 +106,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_1_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_1_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_2.cc b/paludis/repositories/e/e_repository_TEST_2.cc
index 376c824..fc579ca 100644
--- a/paludis/repositories/e/e_repository_TEST_2.cc
+++ b/paludis/repositories/e/e_repository_TEST_2.cc
@@ -106,7 +106,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_2_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_2_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_3.cc b/paludis/repositories/e/e_repository_TEST_3.cc
index 6ee3c74..ff5dc8c 100644
--- a/paludis/repositories/e/e_repository_TEST_3.cc
+++ b/paludis/repositories/e/e_repository_TEST_3.cc
@@ -106,7 +106,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_3_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_3_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_4.cc b/paludis/repositories/e/e_repository_TEST_4.cc
index d287f06..1cbcff9 100644
--- a/paludis/repositories/e/e_repository_TEST_4.cc
+++ b/paludis/repositories/e/e_repository_TEST_4.cc
@@ -106,7 +106,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_4_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_4_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
index 3447cd5..bf31c60 100644
--- a/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.cc
+++ b/paludis/repositories/e/e_repository_TEST_dependencies_rewriter.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
*
* 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
@@ -97,7 +97,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_dependencies_rewriter_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_dependencies_rewriter_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_ever.cc b/paludis/repositories/e/e_repository_TEST_ever.cc
index ce53be6..3d3ab23 100644
--- a/paludis/repositories/e/e_repository_TEST_ever.cc
+++ b/paludis/repositories/e/e_repository_TEST_ever.cc
@@ -114,7 +114,7 @@ namespace
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_ever_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_ever_dir" / "repo1/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index e47299f..2637280 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -111,7 +111,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_exheres_0_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_exlibs.cc b/paludis/repositories/e/e_repository_TEST_exlibs.cc
index 2b7d282..996a17f 100644
--- a/paludis/repositories/e/e_repository_TEST_exlibs.cc
+++ b/paludis/repositories/e/e_repository_TEST_exlibs.cc
@@ -122,7 +122,7 @@ namespace
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_exlibs_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_exlibs_dir" / "repo1/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_pbin.cc b/paludis/repositories/e/e_repository_TEST_pbin.cc
index 27228dd..3daf923 100644
--- a/paludis/repositories/e/e_repository_TEST_pbin.cc
+++ b/paludis/repositories/e/e_repository_TEST_pbin.cc
@@ -114,7 +114,7 @@ namespace test_cases
FSEntry root(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / "root");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("repo" + base_eapi)));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("repo" + base_eapi + "/profiles/profile")));
@@ -130,7 +130,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo);
std::tr1::shared_ptr<Map<std::string, std::string> > b_keys(new Map<std::string, std::string>);
- b_keys->insert("format", "ebuild");
+ b_keys->insert("format", "e");
b_keys->insert("names_cache", "/var/empty");
b_keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("binrepo" + base_eapi)));
b_keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_pbin_dir" / ("binrepo" + base_eapi + "/profiles/profile")));
diff --git a/paludis/repositories/e/e_repository_TEST_phases.cc b/paludis/repositories/e/e_repository_TEST_phases.cc
index dbe6d91..4b39575 100644
--- a/paludis/repositories/e/e_repository_TEST_phases.cc
+++ b/paludis/repositories/e/e_repository_TEST_phases.cc
@@ -122,7 +122,7 @@ namespace
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_phases_dir" / "repo1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_phases_dir" / "repo1/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_TEST_replacing.cc b/paludis/repositories/e/e_repository_TEST_replacing.cc
index 405aa46..3743f8b 100644
--- a/paludis/repositories/e/e_repository_TEST_replacing.cc
+++ b/paludis/repositories/e/e_repository_TEST_replacing.cc
@@ -115,7 +115,7 @@ namespace
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_replacing_dir" / repo_path));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_replacing_dir" / repo_path
diff --git a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
index 4ca312f..eee5c7d 100644
--- a/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
+++ b/paludis/repositories/e/e_repository_TEST_symlink_rewriting.cc
@@ -107,7 +107,7 @@ namespace test_cases
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "e_repository_TEST_symlink_rewriting_dir" / "repo/profiles/profile"));
diff --git a/paludis/repositories/e/e_repository_sets_TEST.cc b/paludis/repositories/e/e_repository_sets_TEST.cc
index 32b5ec6..b4922f3 100644
--- a/paludis/repositories/e/e_repository_sets_TEST.cc
+++ b/paludis/repositories/e/e_repository_sets_TEST.cc
@@ -57,7 +57,7 @@ namespace test_cases
{
TestEnvironment env;
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
@@ -84,7 +84,7 @@ namespace test_cases
{
TestEnvironment env;
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
@@ -124,7 +124,7 @@ namespace test_cases
{
TestEnvironment env;
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
@@ -156,7 +156,7 @@ namespace test_cases
TestEnvironment env;
std::tr1::shared_ptr<Map<std::string, std::string> > keys(
new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "e_repository_sets_TEST_dir/repo1"));
keys->insert("profiles", "e_repository_sets_TEST_dir/repo1/profiles/profile");
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
index 8cf4b81..93966d5 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache_TEST.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) 2008 David Leverton
*
* This file is part of the Paludis package manager. Paludis is free software;
@@ -65,7 +65,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -93,7 +93,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -121,7 +121,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -150,7 +150,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -181,7 +181,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -209,7 +209,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -237,7 +237,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -265,7 +265,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -293,7 +293,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -321,7 +321,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -350,7 +350,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -378,7 +378,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -406,7 +406,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -435,7 +435,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -463,7 +463,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -491,7 +491,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -519,7 +519,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -547,7 +547,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -575,7 +575,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -603,7 +603,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -634,7 +634,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -662,7 +662,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -690,7 +690,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -717,7 +717,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -748,7 +748,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -779,7 +779,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -807,7 +807,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -835,7 +835,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -863,7 +863,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -898,7 +898,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -926,7 +926,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -954,7 +954,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -986,7 +986,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1018,7 +1018,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1047,7 +1047,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1076,7 +1076,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1105,7 +1105,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1141,7 +1141,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1170,7 +1170,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1205,7 +1205,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1241,7 +1241,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1277,7 +1277,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
@@ -1315,7 +1315,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "ebuild_flat_metadata_cache_TEST_dir/repo/profiles/profile"));
diff --git a/paludis/repositories/e/exndbam_repository_TEST.cc b/paludis/repositories/e/exndbam_repository_TEST.cc
index 1bfd568..a5a5a10 100644
--- a/paludis/repositories/e/exndbam_repository_TEST.cc
+++ b/paludis/repositories/e/exndbam_repository_TEST.cc
@@ -127,7 +127,7 @@ namespace test_cases
TestEnvironment env(FSEntry("exndbam_repository_TEST_dir/root").realpath());
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "exndbam_repository_TEST_dir" / "postinsttest_src1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "exndbam_repository_TEST_dir" / "postinsttest_src1/profiles/profile"));
diff --git a/paludis/repositories/e/registration.cc b/paludis/repositories/e/registration.cc
index 9f69347..c696c32 100644
--- a/paludis/repositories/e/registration.cc
+++ b/paludis/repositories/e/registration.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
*
* 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
@@ -54,6 +54,7 @@ namespace paludis
RepositoryFactory * const factory)
{
std::tr1::shared_ptr<Set<std::string> > ebuild_formats(new Set<std::string>);
+ ebuild_formats->insert("e");
ebuild_formats->insert("ebuild");
ebuild_formats->insert("exheres");
diff --git a/paludis/repositories/e/vdb_repository_TEST.cc b/paludis/repositories/e/vdb_repository_TEST.cc
index 217c34e..bdbfed4 100644
--- a/paludis/repositories/e/vdb_repository_TEST.cc
+++ b/paludis/repositories/e/vdb_repository_TEST.cc
@@ -325,7 +325,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "srcrepo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "srcrepo/profiles/profile"));
@@ -455,7 +455,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "srcrepo"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "srcrepo/profiles/profile"));
@@ -607,7 +607,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "namesincrtest_src"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "namesincrtest_src/profiles/profile"));
@@ -970,7 +970,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "providesincrtest_src1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "providesincrtest_src1/profiles/profile"));
@@ -986,7 +986,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo1);
keys.reset(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "providesincrtest_src2"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "providesincrtest_src1/profiles/profile"));
@@ -1165,7 +1165,7 @@ namespace test_cases
TestEnvironment env;
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "reinstalltest_src1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "reinstalltest_src1/profiles/profile"));
@@ -1181,7 +1181,7 @@ namespace test_cases
env.package_database()->add_repository(1, repo1);
keys.reset(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "reinstalltest_src2"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "reinstalltest_src1/profiles/profile"));
@@ -1296,7 +1296,7 @@ namespace test_cases
TestEnvironment env(FSEntry(stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "root")).realpath());
env.set_paludis_command("/bin/false");
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "ebuild");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "postinsttest_src1"));
keys->insert("profiles", stringify(FSEntry::cwd() / "vdb_repository_TEST_dir" / "postinsttest_src1/profiles/profile"));
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc
index 6389709..b94d7d2 100644
--- a/paludis/resolver/resolver_test.cc
+++ b/paludis/resolver/resolver_test.cc
@@ -332,7 +332,7 @@ ResolverTestCase::ResolverTestCase(const std::string & t, const std::string & s,
prefer_or_avoid_names(new Map<QualifiedPackageName, bool>)
{
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
- keys->insert("format", "exheres");
+ keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "repo"));
keys->insert("profiles", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "repo/profiles/profile"));
diff --git a/python/dep_list_TEST_setup.sh b/python/dep_list_TEST_setup.sh
index a37c90c..89231b3 100755
--- a/python/dep_list_TEST_setup.sh
+++ b/python/dep_list_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/python/environment_TEST_setup.sh b/python/environment_TEST_setup.sh
index ea96075..faa56b0 100755
--- a/python/environment_TEST_setup.sh
+++ b/python/environment_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/python/mask_TEST_setup.sh b/python/mask_TEST_setup.sh
index 4492d2e..681e988 100755
--- a/python/mask_TEST_setup.sh
+++ b/python/mask_TEST_setup.sh
@@ -68,7 +68,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/python/package_database_TEST_setup.sh b/python/package_database_TEST_setup.sh
index 2ba115d..6603e54 100755
--- a/python/package_database_TEST_setup.sh
+++ b/python/package_database_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/python/repository_TEST.py b/python/repository_TEST.py
index ef0a559..16eaa48 100755
--- a/python/repository_TEST.py
+++ b/python/repository_TEST.py
@@ -96,7 +96,7 @@ class TestCase_01_Repository(unittest.TestCase):
self.assert_(repo.location_key())
self.assertEquals(repo.location_key().value(), repo_path)
self.assert_(repo.find_metadata("format"))
- self.assertEquals(repo.find_metadata("format").value(), "ebuild")
+ self.assertEquals(repo.find_metadata("format").value(), "e")
self.assert_(not repo.find_metadata("asdf"))
class TestCase_02_RepositoryInterfaces(unittest.TestCase):
diff --git a/python/repository_TEST_setup.sh b/python/repository_TEST_setup.sh
index 55428cc..4b64749 100755
--- a/python/repository_TEST_setup.sh
+++ b/python/repository_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/action_TEST_setup.sh b/ruby/action_TEST_setup.sh
index 3d2ea49..c83e593 100755
--- a/ruby/action_TEST_setup.sh
+++ b/ruby/action_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/dep_list_TEST_setup.sh b/ruby/dep_list_TEST_setup.sh
index b3d5337..923afd2 100755
--- a/ruby/dep_list_TEST_setup.sh
+++ b/ruby/dep_list_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/dep_spec_TEST_setup.sh b/ruby/dep_spec_TEST_setup.sh
index a3f33f3..109d21e 100755
--- a/ruby/dep_spec_TEST_setup.sh
+++ b/ruby/dep_spec_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/dep_tag_TEST_setup.sh b/ruby/dep_tag_TEST_setup.sh
index fd6fdc0..e75fed2 100755
--- a/ruby/dep_tag_TEST_setup.sh
+++ b/ruby/dep_tag_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/environment_TEST_setup.sh b/ruby/environment_TEST_setup.sh
index 6bc1b5b..e3d5bbe 100755
--- a/ruby/environment_TEST_setup.sh
+++ b/ruby/environment_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/generator_TEST_setup.sh b/ruby/generator_TEST_setup.sh
index acf2fe0..2acdce5 100755
--- a/ruby/generator_TEST_setup.sh
+++ b/ruby/generator_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/package_database_TEST_setup.sh b/ruby/package_database_TEST_setup.sh
index 26f1774..8148063 100755
--- a/ruby/package_database_TEST_setup.sh
+++ b/ruby/package_database_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/paludis_ruby_TEST_setup.sh b/ruby/paludis_ruby_TEST_setup.sh
index 09d6e38..6d61f9f 100755
--- a/ruby/paludis_ruby_TEST_setup.sh
+++ b/ruby/paludis_ruby_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/ruby/repository_TEST.rb b/ruby/repository_TEST.rb
index 374e0a8..db6cc7e 100644
--- a/ruby/repository_TEST.rb
+++ b/ruby/repository_TEST.rb
@@ -379,7 +379,7 @@ module Paludis
def test_format_key
assert_kind_of MetadataStringKey, repo.format_key
- assert_equal 'ebuild', repo.format_key.value
+ assert_equal 'e', repo.format_key.value
assert_kind_of MetadataStringKey, installed_repo.format_key
assert_equal 'vdb', installed_repo.format_key.value
end
@@ -397,7 +397,7 @@ module Paludis
def test_subscript
assert_respond_to repo, :[]
assert_kind_of MetadataStringKey, repo['format']
- assert_equal 'ebuild', repo['format'].value
+ assert_equal 'e', repo['format'].value
assert_nil repo['monkey']
end
end
diff --git a/ruby/repository_TEST_setup.sh b/ruby/repository_TEST_setup.sh
index 2eb9bbb..ae218a2 100755
--- a/ruby/repository_TEST_setup.sh
+++ b/ruby/repository_TEST_setup.sh
@@ -8,7 +8,7 @@ mkdir -p home/.paludis/repositories
cat <<END > home/.paludis/repositories/testrepo.conf
location = `pwd`/testrepo
-format = ebuild
+format = e
names_cache = /var/empty
cache = /var/empty
profiles = \${location}/profiles/testprofile
diff --git a/src/clients/cave/continue_on_failure_TEST_setup.sh b/src/clients/cave/continue_on_failure_TEST_setup.sh
index 4ae8670..5e3bf6b 100755
--- a/src/clients/cave/continue_on_failure_TEST_setup.sh
+++ b/src/clients/cave/continue_on_failure_TEST_setup.sh
@@ -33,7 +33,7 @@ END
cat <<END > config/.paludis-continue-on-failure-test/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
builddir = `pwd`/build
diff --git a/src/clients/paludis/continue_on_failure_TEST_setup.sh b/src/clients/paludis/continue_on_failure_TEST_setup.sh
index 1d2d72a..e7ba618 100755
--- a/src/clients/paludis/continue_on_failure_TEST_setup.sh
+++ b/src/clients/paludis/continue_on_failure_TEST_setup.sh
@@ -35,7 +35,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
builddir = `pwd`/build
diff --git a/src/clients/paludis/install_TEST_setup.sh b/src/clients/paludis/install_TEST_setup.sh
index b202c7c..abc9ddf 100755
--- a/src/clients/paludis/install_TEST_setup.sh
+++ b/src/clients/paludis/install_TEST_setup.sh
@@ -61,7 +61,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis-${c}-checks-${d}/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile \${location}/profiles/anothertestprofile
builddir = `pwd`/build
diff --git a/src/clients/paludis/pretend_TEST_setup.sh b/src/clients/paludis/pretend_TEST_setup.sh
index 41cf705..c71653b 100755
--- a/src/clients/paludis/pretend_TEST_setup.sh
+++ b/src/clients/paludis/pretend_TEST_setup.sh
@@ -35,7 +35,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/profile
builddir = `pwd`/build
diff --git a/src/clients/paludis/upgrade_TEST_setup.sh b/src/clients/paludis/upgrade_TEST_setup.sh
index ef0e4c8..674f88e 100755
--- a/src/clients/paludis/upgrade_TEST_setup.sh
+++ b/src/clients/paludis/upgrade_TEST_setup.sh
@@ -40,7 +40,7 @@ END
cat <<END > root/${SYSCONFDIR}/paludis-${a}/repositories/repo1.conf
location = `pwd`/repo1
cache = /var/empty
-format = ebuild
+format = e
names_cache = /var/empty
profiles = \${location}/profiles/testprofile
builddir = `pwd`/build