aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-07-05 15:40:22 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-07-05 15:40:22 +0000
commitc9f239feaa0aefed8ccf33f0ad0ba0baff91b380 (patch)
treeb42347f6ad84ae36a1da3c0cec57685e196673e6
parentd12b02a499ecc9257a6c2c25e14983c83c061fbb (diff)
downloadpaludis-c9f239feaa0aefed8ccf33f0ad0ba0baff91b380.tar.gz
paludis-c9f239feaa0aefed8ccf33f0ad0ba0baff91b380.tar.xz
Be more tolerant of broken ebuilds.
-rw-r--r--paludis/repositories/e/ebuild.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index 1830879..d8505ab 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -252,7 +252,7 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
if (0 == prog.exit_status())
ok = true;
}
- catch (const NameError & e)
+ catch (const Exception & e)
{
Log::get_instance()->message(ll_warning, lc_context, "Caught exception '" +
stringify(e.message()) + "' (" + stringify(e.what()) +
@@ -267,7 +267,6 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
<< *params.package_id << "'";
keys.reset(new Map<std::string, std::string>);
keys->insert("EAPI", EAPIData::get_instance()->unknown_eapi()->name);
- keys->insert("SLOT", "UNKNOWN");
return false;
}
@@ -295,6 +294,7 @@ EbuildMetadataCommand::load(const tr1::shared_ptr<const EbuildID> & id)
if (! id->eapi()->supported)
{
Log::get_instance()->message(ll_debug, lc_context) << "ID pre-load EAPI '" << id->eapi()->name << "' not supported";
+ id->set_slot(SlotName("UNKNOWN"));
return;
}
else
@@ -309,6 +309,7 @@ EbuildMetadataCommand::load(const tr1::shared_ptr<const EbuildID> & id)
if (! id->eapi()->supported)
{
Log::get_instance()->message(ll_debug, lc_context) << "ID post-load EAPI '" << id->eapi()->name << "' not supported";
+ id->set_slot(SlotName("UNKNOWN"));
return;
}
else