[gentoo-commits] proj/portage:master commit in: lib/portage/dbapi/

["Zac Medico" <zmedico@gentoo.org>]

commit:     611a53a6943bf25ac8c1d909e34e4b37c8873e83
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 20 01:37:53 2019 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 02:21:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=611a53a6

portdbapi.getfetchsizes: use .__download__ suffix

If the file does not exist locally or the size is not correct,
use the file with the .__download__ suffix to compute the
remaining_size to fetch.

Fixes: ebbde237d33e ("fetch: atomic downloads (bug 175612)")
Bug: https://bugs.gentoo.org/688124
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/portage/dbapi/porttree.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index edff0c2f2..e4b688b9a 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -14,6 +14,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
 	'portage.dbapi.dep_expand:dep_expand',
 	'portage.dep:Atom,dep_getkey,match_from_list,use_reduce,_match_slot',
 	'portage.package.ebuild.doebuild:doebuild',
+	'portage.package.ebuild.fetch:_download_suffix',
 	'portage.util:ensure_dirs,shlex_split,writemsg,writemsg_level',
 	'portage.util.listdir:listdir',
 	'portage.versions:best,catsplit,catpkgsplit,_pkgsplit@pkgsplit,ver_regexp,_pkg_str',
@@ -844,6 +845,17 @@ class portdbapi(dbapi):
 				mystat = os.stat(file_path)
 			except OSError:
 				pass
+			else:
+				if mystat.st_size != fetch_size:
+					# Use file with _download_suffix instead.
+					mystat = None
+
+			if mystat is None:
+				try:
+					mystat = os.stat(file_path + _download_suffix)
+				except OSError:
+					pass
+
 			if mystat is None:
 				existing_size = 0
 				ro_distdirs = self.settings.get("PORTAGE_RO_DISTDIRS")