diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-06-01 19:33:37 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-01 19:33:37 +0000 |
| commit | 151609186aaa937ce22b50293e8436e6b078e466 (patch) | |
| tree | 4e30a76521ae0621bc0b999028a7987870693cf1 /bin | |
| parent | a630073e781c8bf472cdc4d4f81147fc95ba398b (diff) | |
| download | portage-151609186aaa937ce22b50293e8436e6b078e466.tar.gz portage-151609186aaa937ce22b50293e8436e6b078e466.tar.bz2 portage-151609186aaa937ce22b50293e8436e6b078e466.zip | |
Fix it so repoman still does QA when $FILESDIR doesn't exist.
svn path=/main/trunk/; revision=6716
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/repoman | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/bin/repoman b/bin/repoman index f56769451..9b7a21d6c 100755 --- a/bin/repoman +++ b/bin/repoman @@ -795,12 +795,14 @@ for x in scanlist: s = s[s.rfind("\n") + 1:] fails["file.UTF8"].append("%s/%s: line %i, just after: '%s'" % (checkdir, y, line, s)) + has_filesdir = True + if not os.path.isdir(os.path.join(checkdir, "files")): + has_filesdir = False + if manifest1_compat: + stats["filedir.missing"] += 1 + fails["filedir.missing"].append(checkdir) + if isCvs: - 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") myl=myf.readlines() @@ -818,6 +820,7 @@ for x in scanlist: fails["CVS/Entries.IO_error"].append(checkdir+"/CVS/Entries") continue + if isCvs and has_filesdir: try: myf=open(checkdir+"/files/CVS/Entries","r") myl=myf.readlines() |