Merged from trunk 6101:6104
authorFabian Groffen <grobian@gentoo.org>
Thu, 1 Mar 2007 16:42:13 +0000 (16:42 -0000)
committerFabian Groffen <grobian@gentoo.org>
Thu, 1 Mar 2007 16:42:13 +0000 (16:42 -0000)
commitc2f8e6fd15ddb5d56bf479452699b1046262587f
tree480ec780508518e8a4596fc46a95dfd1a812e3b9
parent4cc1a99cf6169e6842c24114b9c40d418a873c21
Merged from trunk 6101:6104

For bug #168823, fix broken except statement syntax that prevents the
ValueError from being caught as intended.

For bug #168646, don't bail out immediately when rsync detects protocol
incompatibility (code 2) during fetching of the timestamp file.  Retry
for a better server (up to PORTAGE_RSYNC_RETRIES).

svn path=/main/branches/prefix/; revision=6106
pym/emerge/__init__.py
pym/portage/dbapi/vartree.py