aboutsummaryrefslogtreecommitdiff
path: root/src/clients/instruo/instruo.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/clients/instruo/instruo.cc')
-rw-r--r--src/clients/instruo/instruo.cc12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index 19cd3c9..759fbd6 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -222,12 +222,15 @@ main(int argc, char *argv[])
throw args::DoHelp("at least one of '--" + CommandLine::get_instance()->a_repository_directory.long_name() + "' or '--"
+ CommandLine::get_instance()->a_output_directory.long_name() + "' must be specified");
- if (! CommandLine::get_instance()->a_master_repository_dir.specified())
- CommandLine::get_instance()->a_master_repository_dir.set_argument("/var/empty");
-
if (! CommandLine::get_instance()->a_output_directory.specified())
CommandLine::get_instance()->a_output_directory.set_argument(stringify(FSEntry::cwd()));
+ std::tr1::shared_ptr<FSEntrySequence> extra_repository_dirs(new FSEntrySequence);
+ for (args::StringSequenceArg::ConstIterator d(CommandLine::get_instance()->a_extra_repository_dir.begin_args()),
+ d_end(CommandLine::get_instance()->a_extra_repository_dir.end_args()) ;
+ d != d_end ; ++d)
+ extra_repository_dirs->push_back(*d);
+
std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("append_repository_name_to_write_cache", "false");
NoConfigEnvironment env(no_config_environment::Params::create()
@@ -238,7 +241,8 @@ main(int argc, char *argv[])
.disable_metadata_cache(true)
.extra_params(keys)
.extra_accept_keywords("")
- .master_repository_dir(FSEntry(CommandLine::get_instance()->a_master_repository_dir.argument())));
+ .extra_repository_dirs(extra_repository_dirs)
+ .master_repository_name(CommandLine::get_instance()->a_master_repository_name.argument()));
std::tr1::shared_ptr<const PackageIDSequence> ids(env[selection::AllVersionsSorted(
generator::InRepository(env.main_repository()->name()))]);