| 1 |
Author: zmedico |
| 2 |
Date: 2008-08-05 02:15:16 +0000 (Tue, 05 Aug 2008) |
| 3 |
New Revision: 11329 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/bin/repoman |
| 7 |
Log: |
| 8 |
Remove the use.local.desc IUSE validation which is now replaced by glep56 |
| 9 |
metadata.xml validation. This was requested by Cardoe since he expects |
| 10 |
to complete the gleep56 conversion process pretty soon. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/bin/repoman |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/bin/repoman 2008-08-04 19:07:35 UTC (rev 11328) |
| 16 |
+++ main/trunk/bin/repoman 2008-08-05 02:15:16 UTC (rev 11329) |
| 17 |
@@ -565,28 +565,6 @@ |
| 18 |
def caterror(mycat): |
| 19 |
err(mycat+" is not an official category. Skipping QA checks in this directory.\nPlease ensure that you add "+catdir+" to "+repodir+"/profiles/categories\nif it is a new category.") |
| 20 |
|
| 21 |
-# retreive local USE list |
| 22 |
-luselist={} |
| 23 |
-try: |
| 24 |
- f = open(os.path.join(portdir, "profiles", "use.local.desc")) |
| 25 |
- utilities.parse_use_local_desc(f, luselist) |
| 26 |
- f.close() |
| 27 |
-except (IOError, OSError, ParseError), e: |
| 28 |
- logging.exception("Couldn't read from use.local.desc") |
| 29 |
- sys.exit(1) |
| 30 |
- |
| 31 |
-if portdir_overlay != portdir: |
| 32 |
- filename = os.path.join(portdir_overlay, "profiles", "use.local.desc") |
| 33 |
- if os.path.exists(filename): |
| 34 |
- try: |
| 35 |
- f = open(filename) |
| 36 |
- utilities.parse_use_local_desc(f, luselist) |
| 37 |
- f.close() |
| 38 |
- except (IOError, OSError, ParseError), e: |
| 39 |
- logging.exception("Couldn't read from '%s'" % (filename,)) |
| 40 |
- sys.exit(1) |
| 41 |
- del filename |
| 42 |
- |
| 43 |
# setup a uselist from portage |
| 44 |
uselist=[] |
| 45 |
try: |
| 46 |
@@ -1377,13 +1355,6 @@ |
| 47 |
if myuse[mypos] and (myuse[mypos] in muselist): |
| 48 |
del myuse[mypos] |
| 49 |
|
| 50 |
- # uselist checks - local |
| 51 |
- mykey = portage.dep_getkey(catpkg) |
| 52 |
- if mykey in luselist: |
| 53 |
- for mypos in range(len(myuse)-1,-1,-1): |
| 54 |
- if myuse[mypos] and (myuse[mypos] in luselist[mykey]): |
| 55 |
- del myuse[mypos] |
| 56 |
- |
| 57 |
if default_use and eapi == "0": |
| 58 |
for myflag in default_use: |
| 59 |
stats['EAPI.incompatible'] += 1 |
| 60 |
@@ -1435,7 +1406,8 @@ |
| 61 |
portage.dep.paren_reduce(myaux["RESTRICT"]), matchall=1) |
| 62 |
except portage.exception.InvalidDependString, e: |
| 63 |
stats["RESTRICT.syntax"] = stats["RESTRICT.syntax"] + 1 |
| 64 |
- fails["RESTRICT.syntax"].append(mykey+".ebuild RESTRICT: "+str(e)) |
| 65 |
+ fails["RESTRICT.syntax"].append( |
| 66 |
+ "%s: RESTRICT: %s" % (relative_path, e)) |
| 67 |
del e |
| 68 |
if myrestrict: |
| 69 |
myrestrict = set(portage.flatten(myrestrict)) |
Archives