diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-06-01 19:37:58 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-06-01 19:37:58 +0000 |
| commit | 9ea257c39a2a9031adc75622b69a2dc34a63a594 (patch) | |
| tree | 09ddbe0058ae760ac67e47f459845b9d1de78d5a | |
| parent | Instead of calling sys.exit() when aux_get() fails inside getfetchlist(), con... (diff) | |
| download | portage-multirepo-9ea257c39a2a9031adc75622b69a2dc34a63a594.tar.gz portage-multirepo-9ea257c39a2a9031adc75622b69a2dc34a63a594.tar.bz2 portage-multirepo-9ea257c39a2a9031adc75622b69a2dc34a63a594.zip | |
Don't complain when is missing unless manifest1 compatibility is enabled. (trunk r6711 and r6716)
svn path=/main/branches/2.1.2/; revision=6717
| -rwxr-xr-x | bin/repoman | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/bin/repoman b/bin/repoman index 51b3ba53..34227bfd 100755 --- a/bin/repoman +++ b/bin/repoman @@ -783,17 +783,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)) - 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: + 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) - continue + + if isCvs: try: myf=open(checkdir+"/CVS/Entries","r") myl=myf.readlines() @@ -811,6 +808,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() |