From b959a6bfd1a878fe814f43daa2b9d43bb0fbcb52 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 8 Jun 2012 10:22:07 +0300
Subject: [PATCH] Check the existence of dependencies beforehand rather than
 catching the exception

---
 source/csourcefile.cpp | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index c231784..7c4c453 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -29,20 +29,11 @@ void CSourceFile::find_depends()
 
 	const SourcePackage &spkg = comp->get_package();
 	string relname = FS::relative(path, spkg.get_source()).str();
-	DependencyCache &deps_cache = spkg.get_deps_cache();
-	bool deps_found = false;
-	if(mtime<deps_cache.get_mtime())
-	{
-		try
-		{
-			includes = deps_cache.get_deps(relname);
-			deps_found = true;
-		}
-		catch(const key_error &)
-		{ }
-	}
 
-	if(!deps_found)
+	DependencyCache &deps_cache = spkg.get_deps_cache();
+	if(mtime<deps_cache.get_mtime() && deps_cache.has_deps(relname))
+		includes = deps_cache.get_deps(relname);
+	else
 	{
 		try
 		{
-- 
2.43.0