doebuid: clean up AA handling
authorZac Medico <zmedico@gentoo.org>
Wed, 19 Jan 2011 02:33:23 +0000 (18:33 -0800)
committerZac Medico <zmedico@gentoo.org>
Wed, 19 Jan 2011 02:35:43 +0000 (18:35 -0800)
pym/portage/package/ebuild/doebuild.py

index 8a9ec6329c9d076cb51073aafdd73c976b5040ff..d2f226cd0d22d4b84c43db73abe133593a3fadec 100644 (file)
@@ -710,7 +710,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        (mydo in ("fetch", "unpack") or \
                        mydo not in ("digest", "manifest") and "noauto" not in features)
                alist = set(mysettings.configdict["pkg"].get("A", "").split())
-               aalist = set(mysettings.configdict["pkg"].get("AA", "").split())
                if need_distfiles:
 
                        src_uri, = mydbapi.aux_get(mysettings.mycpv,
@@ -723,14 +722,6 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                        use = frozenset(mysettings["PORTAGE_USE"].split())
                        try:
                                alist = _parse_uri_map(mysettings.mycpv, metadata, use=use)
-                       except InvalidDependString as e:
-                               writemsg("!!! %s\n" % str(e), noiselevel=-1)
-                               writemsg(_("!!! Invalid SRC_URI for '%s'.\n") % mycpv,
-                                       noiselevel=-1)
-                               del e
-                               return 1
-
-                       try:
                                aalist = _parse_uri_map(mysettings.mycpv, metadata)
                        except InvalidDependString as e:
                                writemsg("!!! %s\n" % str(e), noiselevel=-1)