Fix spelling of "hierarchy" for bug #131582 and raise an exception for cleaner error...

svn path=/main/trunk/; revision=3261

diff --git a/bin/emerge b/bin/emerge
index a982c20e85325009665bb6e09d3e2e2c92c651a1..88f18d323a3a241bde9f3e3e9d5d7763d3c2cddf 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1084,8 +1084,8 @@ class depgraph:
                                                print red("*** page for details.")
                                                countdown(EMERGE_WARNING_DELAY, "Continuing...")
                                else:
-                                       print red("\n*** %s is not in a valid PORTDIR heirarchy or does not exist" % x)
-                                       sys.exit(1)
+                                       raise portage_exception.PackageNotFound(
+                                               "%s is not in a valid portage tree hierarchy or does not exist" % x)
                                if not self.create(["ebuild",portage.root,mykey],None,"--onlydeps" not in myopts):
                                        return (0,myfavorites)
                                elif not "--oneshot" in myopts:
@@ -3309,7 +3309,11 @@ else:
                        if not ("--quiet" in myopts):
                                print "Calculating dependencies  ",
                                sys.stdout.flush()
-                       retval,favorites=mydepgraph.select_files(myfiles)
+                       try:
+                               retval, favorites = mydepgraph.select_files(myfiles)
+                       except portage_exception.PackageNotFound, e:
+                               portage.writemsg("\n!!! %s\n" % str(e))
+                               sys.exit(1)
                        if not retval:
                                sys.exit(1)
                        if not ("--quiet" in myopts):