Handle UnsupportedAPIException when running the ebuild(1)

command. (trunk r7918)

svn path=/main/branches/2.1.2/; revision=7940

diff --git a/bin/ebuild b/bin/ebuild
index bf90ce189eca12a0fe47ad7149771e285738d12b..a44fcad395ef3a4e292502acfb459c1a9567264e 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -159,6 +159,7 @@ def stale_env_warning():
                        for x in msg:
                                portage.writemsg(">>> %s\n" % x)
 
+from portage_exception import UnsupportedAPIException
 checked_for_stale_env = False
 
 for arg in pargs:
@@ -179,6 +180,13 @@ for arg in pargs:
        except KeyError:
                # aux_get error
                a = 1
+       except UnsupportedAPIException, e:
+               from textwrap import wrap
+               msg = wrap(str(e), 70)
+               del e
+               for x in msg:
+                       portage.writemsg("!!! %s\n" % x, noiselevel=-1)
+               a = 1
        if a == None:
                print "Could not run the required binary?"
                a = 127