aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-05 09:14:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-03-05 09:14:51 +0000
commit388d0d72a962154ee9633f5b84ea4c1f87b0e744 (patch)
tree3e62302f2f057780cd2c620b6d0e131be6258d22
parentfdf3a1df35568902e5d1500796dab6da50b099c2 (diff)
downloadpaludis-388d0d72a962154ee9633f5b84ea4c1f87b0e744.tar.gz
paludis-388d0d72a962154ee9633f5b84ea4c1f87b0e744.tar.xz
Tweak repo error messages
-rw-r--r--paludis/environments/no_config/no_config_environment.cc6
-rw-r--r--paludis/environments/paludis/paludis_config.cc6
2 files changed, 6 insertions, 6 deletions
diff --git a/paludis/environments/no_config/no_config_environment.cc b/paludis/environments/no_config/no_config_environment.cc
index 086ef0d..6250a68 100644
--- a/paludis/environments/no_config/no_config_environment.cc
+++ b/paludis/environments/no_config/no_config_environment.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
@@ -257,14 +257,14 @@ Implementation<NoConfigEnvironment>::initialise(NoConfigEnvironment * const env)
d != d_end ; ++d)
{
if (*d == r->first)
- throw ConfigurationError("Repository '" + stringify(r->first) + "' depends upon itself");
+ throw ConfigurationError("Repository '" + stringify(r->first) + "' requires itself");
try
{
repository_deps.add_edge(r->first, *d, true);
}
catch (const NoSuchGraphNodeError &)
{
- throw ConfigurationError("Repository '" + stringify(r->first) + "' depends upon '" +
+ throw ConfigurationError("Repository '" + stringify(r->first) + "' requires repository '" +
stringify(*d) + "', which is not configured");
}
}
diff --git a/paludis/environments/paludis/paludis_config.cc b/paludis/environments/paludis/paludis_config.cc
index 26cf381..27f2a36 100644
--- a/paludis/environments/paludis/paludis_config.cc
+++ b/paludis/environments/paludis/paludis_config.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
@@ -592,14 +592,14 @@ PaludisConfig::PaludisConfig(PaludisEnvironment * const e, const std::string & s
d != d_end ; ++d)
{
if (*d == r->first)
- throw ConfigurationError("Repository '" + stringify(r->first) + "' depends upon itself");
+ throw ConfigurationError("Repository '" + stringify(r->first) + "' requires itself");
try
{
repository_deps.add_edge(r->first, *d, true);
}
catch (const NoSuchGraphNodeError &)
{
- throw ConfigurationError("Repository '" + stringify(r->first) + "' depends upon '" +
+ throw ConfigurationError("Repository '" + stringify(r->first) + "' requires repository '" +
stringify(*d) + "', which is not configured");
}
}