| 1 |
Author: zmedico |
| 2 |
Date: 2010-03-02 05:45:48 +0000 (Tue, 02 Mar 2010) |
| 3 |
New Revision: 15513 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
Log: |
| 8 |
Bug #306659 - For --rebuilt-binaries, only reinstall if binary package |
| 9 |
BUILD_TIME is non-empty, in order to avoid cases like to bug #306659 where |
| 10 |
BUILD_TIME fields are missing in local and/or remote Packages file. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/depgraph.py 2010-03-02 03:54:17 UTC (rev 15512) |
| 16 |
+++ main/trunk/pym/_emerge/depgraph.py 2010-03-02 05:45:48 UTC (rev 15513) |
| 17 |
@@ -2640,8 +2640,13 @@ |
| 18 |
elif pkg.built: |
| 19 |
built_pkg = pkg |
| 20 |
if built_pkg is not None and inst_pkg is not None: |
| 21 |
- if built_pkg.metadata['BUILD_TIME'] != \ |
| 22 |
- inst_pkg.metadata['BUILD_TIME']: |
| 23 |
+ # Only reinstall if binary package BUILD_TIME is |
| 24 |
+ # non-empty, in order to avoid cases like to |
| 25 |
+ # bug #306659 where BUILD_TIME fields are missing |
| 26 |
+ # in local and/or remote Packages file. |
| 27 |
+ if built_pkg.metadata['BUILD_TIME'] and \ |
| 28 |
+ (built_pkg.metadata['BUILD_TIME'] != \ |
| 29 |
+ inst_pkg.metadata['BUILD_TIME']): |
| 30 |
return built_pkg, built_pkg |
| 31 |
|
| 32 |
if avoid_update: |
Archives