diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-01 18:30:22 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-01 18:30:22 +0000 |
| commit | a630073e781c8bf472cdc4d4f81147fc95ba398b (patch) | |
| tree | 8ae7638848028e07364e4352f34ac2303e077fd9 | |
| parent | e34773812f566001e57a6a60bd4482c230ce2191 (diff) | |
| download | portage-a630073e781c8bf472cdc4d4f81147fc95ba398b.tar.gz portage-a630073e781c8bf472cdc4d4f81147fc95ba398b.tar.bz2 portage-a630073e781c8bf472cdc4d4f81147fc95ba398b.zip | |
Don't complain when $FILESDIR is missing unless manifest1 compatibility is enabled.
svn path=/main/trunk/; revision=6711
| -rwxr-xr-x | bin/repoman | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/repoman b/bin/repoman index f47911665..f56769451 100755 --- a/bin/repoman +++ b/bin/repoman @@ -796,15 +796,10 @@ for x in scanlist: fails["file.UTF8"].append("%s/%s: line %i, just after: '%s'" % (checkdir, y, line, s)) if isCvs: - try: - mystat=os.stat(checkdir+"/files")[0] - if len(ebuildlist) and not S_ISDIR(mystat): - raise Exception - except SystemExit, e: - raise # Need to propogate this - except: - stats["filedir.missing"] += 1 - fails["filedir.missing"].append(checkdir) + if not os.path.isdir(os.path.join(checkdir, "files")): + if manifest1_compat: + stats["filedir.missing"] += 1 + fails["filedir.missing"].append(checkdir) continue try: myf=open(checkdir+"/CVS/Entries","r") |