aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-09 21:31:48 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-11-09 21:31:48 +0000
commitb3a38e91988353704c4277546278f6fdb8ef15e4 (patch)
tree27164757bcc2568d342a1c5b079ab02ace76e74a
parent558da2343f25cec822041f2b3490bbe40bce02d6 (diff)
downloadpaludis-b3a38e91988353704c4277546278f6fdb8ef15e4.tar.gz
paludis-b3a38e91988353704c4277546278f6fdb8ef15e4.tar.xz
--parallel -> --multitask
-rw-r--r--src/clients/paludis/command_line.cc6
-rw-r--r--src/clients/paludis/command_line.hh4
-rw-r--r--src/clients/paludis/sync.cc2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/clients/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index e17c007..6da71be 100644
--- a/src/clients/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
@@ -74,10 +74,10 @@ CommandLine::CommandLine() :
a_resume_command_template(&general_args, "resume-command-template", '\0',
"Save the resume command to a file. If the filename contains 'XXXXXX', use mkstemp(3) to generate the filename"),
#ifdef PALUDIS_ENABLE_THREADS
- a_parallel(&general_args, "parallel", 'P', "Perform tasks in parallel, where supported (currently --sync only)"),
+ a_multitask(&general_args, "multitask", '\0', "Perform tasks in parallel, where supported (currently --sync only)"),
#else
- a_parallel(&general_args, "parallel", 'P', "Does nothing. (For compatibility with Paludis when built with thread "
- "support, which you shouldn't be using.)"),
+ a_multitask(&general_args, "multitask", '\0', "Does nothing. (For compatibility with Paludis when built with thread "
+ "support, which you shouldn't be using yet.)"),
#endif
a_compact(&general_args, "compact", '\0', "Display output using one line per entry (--install, --query)"),
diff --git a/src/clients/paludis/command_line.hh b/src/clients/paludis/command_line.hh
index 6b8b4bb..e56dec2 100644
--- a/src/clients/paludis/command_line.hh
+++ b/src/clients/paludis/command_line.hh
@@ -166,8 +166,8 @@ class CommandLine :
/// --resume-command-template
paludis::args::StringArg a_resume_command_template;
- /// --parallel
- paludis::args::SwitchArg a_parallel;
+ /// --multitask
+ paludis::args::SwitchArg a_multitask;
/// --compact
paludis::args::SwitchArg a_compact;
diff --git a/src/clients/paludis/sync.cc b/src/clients/paludis/sync.cc
index 3a8b4cb..bb367bc 100644
--- a/src/clients/paludis/sync.cc
+++ b/src/clients/paludis/sync.cc
@@ -124,7 +124,7 @@ int do_sync(tr1::shared_ptr<Environment> env)
bool parallel(false);
#ifdef PALUDIS_ENABLE_THREADS
- parallel = CommandLine::get_instance()->a_parallel.specified();
+ parallel = CommandLine::get_instance()->a_multitask.specified();
#endif
OurSyncTask task(env, parallel);