aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-14 14:51:57 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-14 14:51:57 +0000
commite3f0cb7da5a2e6313a523a47d2d0956df0fe0e48 (patch)
tree497e58b73df85cf2ab1f23ae91ba84de33f140f3
parentf8607b57c8ec9d0f2e7798e67efdf1c99c72017b (diff)
downloadpaludis-e3f0cb7da5a2e6313a523a47d2d0956df0fe0e48.tar.gz
paludis-e3f0cb7da5a2e6313a523a47d2d0956df0fe0e48.tar.xz
Move MakeEnvCommand out of internals and into a public namespace so that we can use it inside a loop for USE_EXPAND vars (uh, the other half of the commit)
-rw-r--r--paludis/util/system.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index b673350..5fb2257 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -89,15 +89,15 @@ paludis::run_command(const std::string & cmd)
throw InternalError(PALUDIS_HERE, "should never be reached");
}
-system_internals::MakeEnvCommand::MakeEnvCommand(const std::string & c,
+MakeEnvCommand::MakeEnvCommand(const std::string & c,
const std::string & a) :
cmd(c),
args(a)
{
}
-system_internals::MakeEnvCommand
-system_internals::MakeEnvCommand::operator() (const std::string & k,
+MakeEnvCommand
+MakeEnvCommand::operator() (const std::string & k,
const std::string & v) const
{
std::string vv;
@@ -110,14 +110,14 @@ system_internals::MakeEnvCommand::operator() (const std::string & k,
return MakeEnvCommand(cmd, args + k + "='" + vv + "' ");
}
-system_internals::MakeEnvCommand::operator std::string() const
+MakeEnvCommand::operator std::string() const
{
return "/usr/bin/env " + args + cmd;
}
-const system_internals::MakeEnvCommand
+const MakeEnvCommand
paludis::make_env_command(const std::string & cmd)
{
- return system_internals::MakeEnvCommand(cmd, "");
+ return MakeEnvCommand(cmd, "");
}