From 02029f153f2cc0222b2980e621ce3b95f618b2f1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Tue, 2 Mar 2010 21:14:20 +0000 Subject: [PATCH] Bug #306659 - For --rebuilt-binaries, only reinstall if binary package BUILD_TIME is non-empty, in order to avoid cases like to bug #306659 where BUILD_TIME fields are missing in local and/or remote Packages file. (trunk r15513) svn path=/main/branches/2.1.7/; revision=15711 --- pym/_emerge/depgraph.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 2c2941186..b1b655ec1 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2640,8 +2640,13 @@ class depgraph(object): elif pkg.built: built_pkg = pkg if built_pkg is not None and inst_pkg is not None: - if built_pkg.metadata['BUILD_TIME'] != \ - inst_pkg.metadata['BUILD_TIME']: + # Only reinstall if binary package BUILD_TIME is + # non-empty, in order to avoid cases like to + # bug #306659 where BUILD_TIME fields are missing + # in local and/or remote Packages file. + if built_pkg.metadata['BUILD_TIME'] and \ + (built_pkg.metadata['BUILD_TIME'] != \ + inst_pkg.metadata['BUILD_TIME']): return built_pkg, built_pkg if avoid_update: -- 2.26.2