Let InternalError through even when we convert other exceptions into warnings.

29 files changed, 220 insertions, 0 deletions

diff --git a/paludis/ndbam.cc b/paludis/ndbam.cc
index 8d4c839b7..6e6cb7de2 100644
--- a/paludis/ndbam.cc
+++ b/paludis/ndbam.cc
@@ -327,6 +327,10 @@ NDBAM::entries(const QualifiedPackageName & q)
                                 .magic(m)
                                 .mutex(make_shared_ptr(new Mutex)))));
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context) << "Skipping directory '" << *d << "' due to exception '"
@@ -525,6 +529,10 @@ NDBAM::category_names_containing_package(const PackageNamePart & p) const
                 {
                     cncp.category_names_containing_package->insert(CategoryNamePart(d->basename()));
                 }
+                catch (const InternalError &)
+                {
+                    throw;
+                }
                 catch (const Exception & e)
                 {
                     Log::get_instance()->message(ll_warning, lc_context) << "Skipping directory '" << *d << "' due to exception '"
diff --git a/paludis/repositories/cran/cran_package_id.cc b/paludis/repositories/cran/cran_package_id.cc
index bee81d7b5..77d0e8913 100644
--- a/paludis/repositories/cran/cran_package_id.cc
+++ b/paludis/repositories/cran/cran_package_id.cc
@@ -265,6 +265,10 @@ CRANPackageID::CRANPackageID(const Environment * const env, const tr1::shared_pt
             _imp->depends_key.reset(new DepKey(_imp->env, "Depends", "Depends", "R", _imp->depends_labels, mkt_dependencies));
         add_metadata_key(_imp->depends_key);
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context) << "Broken CRAN description file '" << stringify(f) << "': '"
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index c8bd5ffe4..80033dd3a 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -591,6 +591,10 @@ ERepository::repository_masked(const PackageID & id) const
                             + stringify(line->first) + "' failed because specification does not restrict to a "
                             "unique package");
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context, "Loading package mask spec '"
diff --git a/paludis/repositories/e/e_repository_news.cc b/paludis/repositories/e/e_repository_news.cc
index 1e1e6997e..c6eb96e20 100644
--- a/paludis/repositories/e/e_repository_news.cc
+++ b/paludis/repositories/e/e_repository_news.cc
@@ -200,6 +200,10 @@ ERepositoryNews::update_news() const
                 }
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_no_context,
diff --git a/paludis/repositories/e/e_repository_profile.cc b/paludis/repositories/e/e_repository_profile.cc
index 1fb141852..4694fb841 100644
--- a/paludis/repositories/e/e_repository_profile.cc
+++ b/paludis/repositories/e/e_repository_profile.cc
@@ -342,6 +342,10 @@ Implementation<ERepositoryProfile>::load_profile_make_defaults(const FSEntry & d
             tokenise_whitespace(environment_variables[use_expand_var],
                     create_inserter<UseFlagName>(std::inserter(use_expand, use_expand.end())));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Loading '" + use_expand_var + "' failed due to exception: "
@@ -361,6 +365,10 @@ Implementation<ERepositoryProfile>::load_special_make_defaults_vars()
             tokenise_whitespace(environment_variables[use_var],
                     create_inserter<UseFlagName>(std::inserter(use, use.end())));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Loading '" + use_var + "' failed due to exception: "
@@ -376,6 +384,10 @@ Implementation<ERepositoryProfile>::load_special_make_defaults_vars()
             tokenise_whitespace(environment_variables[use_expand_var],
                     create_inserter<UseFlagName>(std::inserter(use_expand, use_expand.end())));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Loading '" + use_expand_var + "' failed due to exception: "
@@ -391,6 +403,10 @@ Implementation<ERepositoryProfile>::load_special_make_defaults_vars()
             tokenise_whitespace(environment_variables[use_expand_hidden_var],
                     create_inserter<UseFlagName>(std::inserter(use_expand_hidden, use_expand_hidden.end())));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Loading '" + use_expand_hidden_var + "' failed due to exception: "
@@ -415,6 +431,10 @@ Implementation<ERepositoryProfile>::is_incremental(const std::string & s) const
              || s == "CONFIG_PROTECT_MASK"
              || use_expand.end() != use_expand.find(UseFlagName(s)));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & x)
     {
         Log::get_instance()->message(ll_qa, lc_context) << "Caught exception '" << x.message() << "' (" << x.what()
@@ -450,6 +470,10 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
                 system_packages->add(tr1::shared_ptr<SetSpecTree::ConstItem>(new TreeLeaf<SetSpecTree, PackageDepSpec>(spec)));
             }
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Loading packages "
@@ -475,6 +499,10 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
                                             repository->params().profile_eapi), tr1::shared_ptr<const PackageID>())))));
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Loading virtuals "
@@ -500,6 +528,10 @@ Implementation<ERepositoryProfile>::make_vars_from_file_vars()
                         + stringify(line->first) + "' failed because specification does not restrict to a "
                         "unique package");
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Loading package.mask spec '"
@@ -535,6 +567,10 @@ Implementation<ERepositoryProfile>::load_basic_use_file(const FSEntry & file, Fl
                 else
                     m[UseFlagName(*t)] = true;
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context, "Ignoring token '"
@@ -580,6 +616,10 @@ Implementation<ERepositoryProfile>::load_spec_use_file(const FSEntry & file, Pac
                     else
                         n->second[UseFlagName(*t)] = true;
                 }
+                catch (const InternalError &)
+                {
+                    throw;
+                }
                 catch (const Exception & e)
                 {
                     Log::get_instance()->message(ll_warning, lc_context, "Ignoring token '"
@@ -638,6 +678,10 @@ Implementation<ERepositoryProfile>::handle_profile_arch_var(const std::string &
         use.insert(arch);
         stacked_values_list.back().use_force[arch] = true;
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception &)
     {
         throw ERepositoryConfigurationError("Variable '" + s + "' has invalid value '" + arch_s + "'");
diff --git a/paludis/repositories/e/ebuild.cc b/paludis/repositories/e/ebuild.cc
index ab709ceb7..be630fbaf 100644
--- a/paludis/repositories/e/ebuild.cc
+++ b/paludis/repositories/e/ebuild.cc
@@ -315,6 +315,10 @@ EbuildMetadataCommand::do_run_command(const Command & cmd)
         if (0 == exit_status)
             ok = true;
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_context, "Caught exception '" +
@@ -417,6 +421,10 @@ EbuildMetadataCommand::load(const tr1::shared_ptr<const EbuildID> & id)
             }
             id->set_slot(SlotName(slot));
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context) << "Setting SLOT for '" << *id << "' failed due to exception '"
diff --git a/paludis/repositories/e/ebuild_flat_metadata_cache.cc b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
index c71ccc103..a966ef84a 100644
--- a/paludis/repositories/e/ebuild_flat_metadata_cache.cc
+++ b/paludis/repositories/e/ebuild_flat_metadata_cache.cc
@@ -176,6 +176,10 @@ EbuildFlatMetadataCache::load(const tr1::shared_ptr<const EbuildID> & id)
                 return false;
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_no_context) << "Not using cache file at '"
@@ -364,6 +368,10 @@ EbuildFlatMetadataCache::save(const tr1::shared_ptr<const EbuildID> & id)
                 cache << std::endl;
         }
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         Log::get_instance()->message(ll_warning, lc_no_context) << "Not writing cache file to '"
diff --git a/paludis/repositories/e/exheres_layout.cc b/paludis/repositories/e/exheres_layout.cc
index 675eda418..d846391fd 100644
--- a/paludis/repositories/e/exheres_layout.cc
+++ b/paludis/repositories/e/exheres_layout.cc
@@ -211,6 +211,10 @@ ExheresLayout::need_package_ids(const QualifiedPackageName & n) const
             else
                 v->push_back(id);
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & ee)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Skipping entry '"
diff --git a/paludis/repositories/e/qa/categories.cc b/paludis/repositories/e/qa/categories.cc
index 908aaa2a6..0f5f6ac32 100644
--- a/paludis/repositories/e/qa/categories.cc
+++ b/paludis/repositories/e/qa/categories.cc
@@ -91,6 +91,10 @@ paludis::erepository::categories_check(
             }
         }
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & err)
     {
         reporter.message(QAMessage(cats, qaml_severe, name, "Caught Exception '" + err.message() + "' ("
diff --git a/paludis/repositories/e/qa/deprecated_functions.cc b/paludis/repositories/e/qa/deprecated_functions.cc
index ff2c7c965..19e20d3a9 100644
--- a/paludis/repositories/e/qa/deprecated_functions.cc
+++ b/paludis/repositories/e/qa/deprecated_functions.cc
@@ -55,6 +55,10 @@ namespace
 
                         std::back_inserter(deprecated_functions));
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context) << "Got error '" << e.message() << "' (" << e.what()
diff --git a/paludis/repositories/e/qa/extractors.cc b/paludis/repositories/e/qa/extractors.cc
index a6065571b..c8110b646 100644
--- a/paludis/repositories/e/qa/extractors.cc
+++ b/paludis/repositories/e/qa/extractors.cc
@@ -54,6 +54,10 @@ namespace
             {
                 file.reset(new KeyValueConfigFile(f, KeyValueConfigFileOptions()));
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context) << "Got error '" << e.message() << "' (" << e.what()
@@ -393,6 +397,10 @@ paludis::erepository::extractors_check(
                 }
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/fetches_key.cc b/paludis/repositories/e/qa/fetches_key.cc
index cec9f7088..aab6c6eec 100644
--- a/paludis/repositories/e/qa/fetches_key.cc
+++ b/paludis/repositories/e/qa/fetches_key.cc
@@ -202,6 +202,10 @@ paludis::erepository::fetches_key_check(
                       id, id->fetches_key(), entry, name);
             id->fetches_key()->value()->accept(c);
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/inherited_key.cc b/paludis/repositories/e/qa/inherited_key.cc
index 05518b73b..192291863 100644
--- a/paludis/repositories/e/qa/inherited_key.cc
+++ b/paludis/repositories/e/qa/inherited_key.cc
@@ -53,6 +53,10 @@ namespace
                 std::copy(inherited_blacklist_file.begin(), inherited_blacklist_file.end(),
                         std::inserter(inherited_blacklist, inherited_blacklist.end()));
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context) << "Got error '" << e.message() << "' (" << e.what()
@@ -86,6 +90,10 @@ paludis::erepository::inherited_key_check(
                             .with_associated_id(id)
                             .with_associated_key(id, id->inherited_key()));
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/iuse_key.cc b/paludis/repositories/e/qa/iuse_key.cc
index b0c1a2b7c..eeedaf31f 100644
--- a/paludis/repositories/e/qa/iuse_key.cc
+++ b/paludis/repositories/e/qa/iuse_key.cc
@@ -53,6 +53,10 @@ namespace
                 std::copy(iuse_blacklist_file.begin(), iuse_blacklist_file.end(),
                         create_inserter<UseFlagName>(std::inserter(iuse_blacklist, iuse_blacklist.end())));
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 Log::get_instance()->message(ll_warning, lc_context) << "Got error '" << e.message() << "' (" << e.what()
@@ -96,6 +100,10 @@ paludis::erepository::iuse_key_check(
                                     .with_associated_key(id, id->iuse_key()));
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/keywords_key.cc b/paludis/repositories/e/qa/keywords_key.cc
index 09c4b7f2f..54e53a4c3 100644
--- a/paludis/repositories/e/qa/keywords_key.cc
+++ b/paludis/repositories/e/qa/keywords_key.cc
@@ -68,6 +68,10 @@ paludis::erepository::keywords_key_check(
                                     .with_associated_key(id, id->keywords_key())
                                     .with_associated_key(id, id->eclass_keywords_key()));
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/license_key.cc b/paludis/repositories/e/qa/license_key.cc
index 4fec29812..e7d1bc1da 100644
--- a/paludis/repositories/e/qa/license_key.cc
+++ b/paludis/repositories/e/qa/license_key.cc
@@ -95,6 +95,10 @@ paludis::erepository::license_key_check(
             Checker c(entry, reporter, id, repo->layout()->licenses_dirs(), name);
             id->license_key()->value()->accept(c);
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             reporter.message(QAMessage(entry, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/manifest.cc b/paludis/repositories/e/qa/manifest.cc
index cadd7fd8c..416ceb515 100644
--- a/paludis/repositories/e/qa/manifest.cc
+++ b/paludis/repositories/e/qa/manifest.cc
@@ -281,6 +281,10 @@ paludis::erepository::manifest_check(
         else
             reporter.message(QAMessage(manifest, qaml_minor, name, "Manifest not signed"));
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         reporter.message(QAMessage(dir, qaml_severe, name,
diff --git a/paludis/repositories/e/qa/metadata_keys.cc b/paludis/repositories/e/qa/metadata_keys.cc
index de70fc6ef..13b43ce85 100644
--- a/paludis/repositories/e/qa/metadata_keys.cc
+++ b/paludis/repositories/e/qa/metadata_keys.cc
@@ -165,6 +165,10 @@ paludis::erepository::metadata_keys_check(
         {
             (*it)->accept(validator);
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             retval = false;
diff --git a/paludis/repositories/e/qa/qa_controller.cc b/paludis/repositories/e/qa/qa_controller.cc
index 60a8f4bdb..3ab08e997 100644
--- a/paludis/repositories/e/qa/qa_controller.cc
+++ b/paludis/repositories/e/qa/qa_controller.cc
@@ -244,6 +244,10 @@ QAController::_check_eclasses(const FSEntry & dir, const std::string & type)
                                     _imp->env, _imp->repo, content)));
             }
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         _imp->reporter.message(
@@ -371,6 +375,10 @@ QAController::_check_id(const tr1::shared_ptr<const PackageID> & i)
                                 _imp->env, _imp->repo, tr1::static_pointer_cast<const ERepositoryID>(i), content)));
         }
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         _imp->reporter.message(
@@ -424,6 +432,10 @@ QAController::run()
         _worker();
 #endif
     }
+    catch (const InternalError &)
+    {
+        throw;
+    }
     catch (const Exception & e)
     {
         _imp->reporter.message(
diff --git a/paludis/repositories/e/qa/spec_keys.cc b/paludis/repositories/e/qa/spec_keys.cc
index 656bfa107..ae18cf89c 100644
--- a/paludis/repositories/e/qa/spec_keys.cc
+++ b/paludis/repositories/e/qa/spec_keys.cc
@@ -389,6 +389,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, tr1::shared_ptr<const QualifiedPackageNameSet>(), false, false);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
@@ -406,6 +410,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, tr1::shared_ptr<const QualifiedPackageNameSet>(), true, true);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
@@ -423,6 +431,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, tr1::shared_ptr<const QualifiedPackageNameSet>(), true, true);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
@@ -440,6 +452,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, SpecKeysBlacklist::get_instance()->blacklist(k.raw_name()), false, true);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
@@ -457,6 +473,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, SpecKeysBlacklist::get_instance()->blacklist(k.raw_name()), true, true);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
@@ -474,6 +494,10 @@ namespace
                 Checker c(entry, reporter, id, iuse_flags, key, name, tr1::shared_ptr<const QualifiedPackageNameSet>(), true, true);
                 k.value()->accept(c);
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 reporter.message(QAMessage(entry, qaml_severe, name, "Caught exception '" + stringify(e.message()) + "' ("
diff --git a/paludis/repositories/e/traditional_layout.cc b/paludis/repositories/e/traditional_layout.cc
index c38b36211..e07175428 100644
--- a/paludis/repositories/e/traditional_layout.cc
+++ b/paludis/repositories/e/traditional_layout.cc
@@ -229,6 +229,10 @@ TraditionalLayout::need_package_ids(const QualifiedPackageName & n) const
             else
                 v->push_back(id);
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & ee)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Skipping entry '"
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index 73f4d6b02..9c86da77e 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -874,6 +874,10 @@ VDBRepository::need_category_names() const
                 _imp->categories.insert(std::make_pair(CategoryNamePart(d->basename()),
                             tr1::shared_ptr<QualifiedPackageNameSet>()));
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context) << "Skipping VDB category dir '"
@@ -913,6 +917,10 @@ VDBRepository::need_package_ids(const CategoryNamePart & c) const
                 i->second->push_back(make_id(*p.package_ptr(), p.version_requirements_ptr()->begin()->version_spec, *d));
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context) << "Skipping VDB package dir '"
diff --git a/paludis/repositories/gems/gem_specifications.cc b/paludis/repositories/gems/gem_specifications.cc
index 1838bcc38..b03442fa4 100644
--- a/paludis/repositories/gems/gem_specifications.cc
+++ b/paludis/repositories/gems/gem_specifications.cc
@@ -126,6 +126,10 @@ namespace
                     tr1::shared_ptr<GemSpecification> spec(new GemSpecification(environment, repository, *i->second));
                     _imp->specs.insert(std::make_pair(std::make_pair(spec->name(), spec->version()), spec));
                 }
+                catch (const InternalError &)
+                {
+                    throw;
+                }
                 catch (const Exception & e)
                 {
                     Log::get_instance()->message(ll_qa, lc_context) << "Skipping entry '"
diff --git a/paludis/set_file.cc b/paludis/set_file.cc
index ef458280b..e118595a3 100644
--- a/paludis/set_file.cc
+++ b/paludis/set_file.cc
@@ -224,6 +224,10 @@ namespace
                 Log::get_instance()->message(ll_warning, lc_context, "Ignoring line '" + stringify(line) +
                         "' because it does not start with '?' or '*'");
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Ignoring line '" + stringify(line) +
@@ -286,6 +290,10 @@ SimpleHandler::_create_contents() const
                             new TreeLeaf<SetSpecTree, PackageDepSpec>(p)));
             }
         }
+        catch (const InternalError &)
+        {
+            throw;
+        }
         catch (const Exception & e)
         {
             Log::get_instance()->message(ll_warning, lc_context, "Ignoring line '" + stringify(*i) +
diff --git a/src/clients/accerso/accerso.cc b/src/clients/accerso/accerso.cc
index b5c15f38d..ce3df50e1 100644
--- a/src/clients/accerso/accerso.cc
+++ b/src/clients/accerso/accerso.cc
@@ -163,6 +163,10 @@ main(int argc, char *argv[])
                         results.insert(std::make_pair(*i, (*f)[k::target_file()] + ": " + r));
                     }
                 }
+                catch (const InternalError &)
+                {
+                    throw;
+                }
                 catch (const Exception & e)
                 {
                     results.insert(std::make_pair(*i, "Uncaught exception '" + e.message() + "' (" + e.what() + ")"));
diff --git a/src/clients/adjutrix/find_reverse_deps.cc b/src/clients/adjutrix/find_reverse_deps.cc
index 92771403a..d14e769a2 100644
--- a/src/clients/adjutrix/find_reverse_deps.cc
+++ b/src/clients/adjutrix/find_reverse_deps.cc
@@ -239,6 +239,10 @@ namespace
 
                 found_matches |= checker.found_matches();
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & exception)
             {
                 cerr << "Caught exception:" << endl;
diff --git a/src/clients/inquisitio/do_search.cc b/src/clients/inquisitio/do_search.cc
index 8617776d8..5fd0d55f6 100644
--- a/src/clients/inquisitio/do_search.cc
+++ b/src/clients/inquisitio/do_search.cc
@@ -140,6 +140,10 @@ namespace
                             return tr1::shared_ptr<const PackageID>();
                     }
                 }
+                catch (const InternalError &)
+                {
+                    throw;
+                }
                 catch (const Exception & ex)
                 {
                     Log::get_instance()->message(ll_warning, lc_context,
diff --git a/src/clients/instruo/instruo.cc b/src/clients/instruo/instruo.cc
index b6c543d5b..b2e696025 100644
--- a/src/clients/instruo/instruo.cc
+++ b/src/clients/instruo/instruo.cc
@@ -280,6 +280,10 @@ main(int argc, char *argv[])
                     {
                         (*m)->accept(v);
                     }
+                    catch (const InternalError &)
+                    {
+                        throw;
+                    }
                     catch (const Exception & e)
                     {
                         results.insert(std::make_pair(*i, "Error in metadata key '" + (*m)->raw_name() + "': '" + e.message() +
@@ -291,6 +295,10 @@ main(int argc, char *argv[])
                 if (! metadata_errors)
                     ++success;
             }
+            catch (const InternalError &)
+            {
+                throw;
+            }
             catch (const Exception & e)
             {
                 results.insert(std::make_pair(*i, "Uncaught exception '" + e.message() + "' (" + e.what() + ")"));
diff --git a/src/clients/qualudis/qualudis.cc b/src/clients/qualudis/qualudis.cc
index e85c60f63..1eb4e9840 100644
--- a/src/clients/qualudis/qualudis.cc
+++ b/src/clients/qualudis/qualudis.cc
@@ -270,6 +270,10 @@ namespace
                         i->second->accept(pp);
                         std::cout << "    " << pp.stream.str();
                     }
+                    catch (const InternalError &)
+                    {
+                        throw;
+                    }
                     catch (const Exception &)
                     {
                         // assume one of the QA checks already