removed another catch-them-all exception handler

yast · Sep 9, 2014 · ecacd98 · ecacd98
1 parent 2c4843e
commit ecacd98
Showing 1 changed file with 30 additions and 34 deletions.
diff --git a/src/Resolvable_Properties.cc b/src/Resolvable_Properties.cc
@@ -537,43 +537,39 @@ YCPMap PkgFunctions::Resolvable2YCPMap(const zypp::PoolItem &item, const std::st
 	for (std::set<std::string>::const_iterator kind_it = _kinds.begin();
 	    kind_it != _kinds.end(); ++kind_it)
 	{
-	    try {
-		zypp::Dep depkind(*kind_it);
-		zypp::Capabilities deps = item.resolvable()->dep(depkind);
-
-		// add raw dependencies
-		for_(it, deps.begin(), deps.end())
-		{
-		    YCPMap rawdep;
-		    rawdep->add(YCPString(*kind_it), YCPString(it->asString()));
-		    rawdeps->add(rawdep);
-		}
+            zypp::Dep depkind(*kind_it);
+            zypp::Capabilities deps = item.resolvable()->dep(depkind);
+
+            // add raw dependencies
+            for_(it, deps.begin(), deps.end())
+            {
+                YCPMap rawdep;
+                rawdep->add(YCPString(*kind_it), YCPString(it->asString()));
+                rawdeps->add(rawdep);
+            }
 
-		zypp::sat::WhatProvides prv(deps);
+            zypp::sat::WhatProvides prv(deps);
 
-		// resolve dependencies
-		for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d)
-		{
-		    if (d->kind().asString().empty() || d->name().empty())
-		    {
-			y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str());
-		    }
-		    else
-		    {
-			YCPMap ycpdep;
-			ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString()));
-			ycpdep->add (YCPString ("name"), YCPString (d->name()));
-			ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it));
+            // resolve dependencies
+            for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d)
+            {
+                if (d->kind().asString().empty() || d->name().empty())
+                {
+                    y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str());
+                }
+                else
+                {
+                    YCPMap ycpdep;
+                    ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString()));
+                    ycpdep->add (YCPString ("name"), YCPString (d->name()));
+                    ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it));
 
-			if (!ycpdeps.contains(ycpdep))
-			{
-			    ycpdeps->add (ycpdep);
-			}
-		    }
-		}
-	    }
-	    catch (...)
-	    {}
+                    if (!ycpdeps.contains(ycpdep))
+                    {
+                        ycpdeps->add (ycpdep);
+                    }
+                }
+            }
 	}
 
 	if (ycpdeps.size() > 0)