diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-02-13 00:33:51 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-02-13 20:26:54 -0800 |
| commit | f514515a6b85286dcc84011143f9f550d96dc15a (patch) | |
| tree | ffdafaf7ff95093597c2c18ec1454687ccdfd699 /bin | |
| parent | a1ead27a48733601cfbac18ef07f1593dbd524d1 (diff) | |
| download | portage-f514515a6b85286dcc84011143f9f550d96dc15a.tar.gz portage-f514515a6b85286dcc84011143f9f550d96dc15a.tar.bz2 portage-f514515a6b85286dcc84011143f9f550d96dc15a.zip | |
egencache: don't ignore as much with --tolerant
Errors returned from --update-use-local-desc and --update-changelogs
are no longer ignored with --tolerant. This will fix part of
bug #354687.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/egencache | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/egencache b/bin/egencache index 76dd900e7..89d2fdec4 100755 --- a/bin/egencache +++ b/bin/egencache @@ -791,7 +791,10 @@ def egencache_main(args): max_load=options.load_average, rsync=options.rsync) gen_cache.run() - ret.append(gen_cache.returncode) + if options.tolerant: + ret.append(os.EX_OK) + else: + ret.append(gen_cache.returncode) if options.update_use_local_desc: gen_desc = GenUseLocalDesc(portdb, @@ -805,8 +808,6 @@ def egencache_main(args): gen_clogs.run() ret.append(gen_clogs.returncode) - if options.tolerant: - return ret[0] return max(ret) if __name__ == "__main__": |