diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-02 05:45:48 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-02 05:45:48 +0000 |
| commit | 398c490c16b548cacb62c25e12a9fe7a4106c720 (patch) | |
| tree | f5a87026518a6f6ea7021f9fcdf01849e2451368 | |
| parent | b2857e3458cfdcfc59e47fe25bd1698717e66f5a (diff) | |
| download | portage-398c490c16b548cacb62c25e12a9fe7a4106c720.tar.gz portage-398c490c16b548cacb62c25e12a9fe7a4106c720.tar.bz2 portage-398c490c16b548cacb62c25e12a9fe7a4106c720.zip | |
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.
svn path=/main/trunk/; revision=15513
| -rw-r--r-- | pym/_emerge/depgraph.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index 65144187b..811e6f522 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: |