2 files changed, 13 insertions, 1 deletions
diff --git a/bin/equery b/bin/equery
index 0e52294..3b3e850 100755
--- a/bin/equery
+++ b/bin/equery
@@ -29,6 +29,16 @@ except KeyboardInterrupt:
     sys.exit(1)
 
 from gentoolkit import equery, errors
+import warnings
+
+
+def formatwarning(message, category, filename, llineno, line=None):
+    from gentoolkit import pprinter as pp
+    return pp.warn(str(message))
+
+
+if '--debug' not in sys.argv and not bool(os.getenv('DEBUG', False)):
+    warnings.formatwarning = formatwarning
 
 try:
     equery.main(sys.argv)
diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py
index 4cf4bc6..2e8dc36 100644
--- a/pym/gentoolkit/equery/meta.py
+++ b/pym/gentoolkit/equery/meta.py
@@ -13,6 +13,7 @@ __docformat__ = "epytext"
 import re
 import os
 import sys
+import warnings
 from getopt import gnu_getopt, GetoptError
 
 import gentoolkit.pprinter as pp
@@ -524,7 +525,8 @@ def main(input_args):
         best_match = query.find_best()
         matches = query.find(include_masked=True)
         if best_match is None or not matches:
-            raise errors.GentoolkitNoMatches(query)
+            warnings.warn(errors.GentoolkitNoMatches(query))
+            continue
 
         if best_match.metadata is None:
             print(