| 1 |
commit: 1fc6cae0b2de181df5ba4c5b3f21b06604555387 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 10 07:52:10 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 10 07:57:38 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1fc6cae0 |
| 7 |
|
| 8 |
doebuild: skip timestamp check for deleted distfiles (bug 668206) |
| 9 |
|
| 10 |
Avoid behavior like this when a distfile has been removed: |
| 11 |
|
| 12 |
>>> Existing ${T}/environment for 'chromium-70.0.3538.45' will be sourced. |
| 13 |
>>> Run 'clean' to start with a fresh environment. |
| 14 |
>>> Checking chromium-70.0.3538.45.tar.xz's mtime... |
| 15 |
>>> Timestamp of chromium-70.0.3538.45.tar.xz has changed; recreating WORKDIR... |
| 16 |
|
| 17 |
Bug: https://bugs.gentoo.org/668206 |
| 18 |
Reported-by: Michał Górny <mgorny <AT> gentoo.org> |
| 19 |
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> |
| 20 |
|
| 21 |
lib/portage/package/ebuild/doebuild.py | 4 ++-- |
| 22 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 23 |
|
| 24 |
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py |
| 25 |
index 621fe7360..9706de422 100644 |
| 26 |
--- a/lib/portage/package/ebuild/doebuild.py |
| 27 |
+++ b/lib/portage/package/ebuild/doebuild.py |
| 28 |
@@ -934,10 +934,10 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, |
| 29 |
x_st = os.stat(os.path.join( |
| 30 |
mysettings["DISTDIR"], x)) |
| 31 |
except OSError: |
| 32 |
- # file not fetched yet |
| 33 |
+ # file deleted |
| 34 |
x_st = None |
| 35 |
|
| 36 |
- if x_st is None or x_st.st_mtime > workdir_st.st_mtime: |
| 37 |
+ if x_st is not None and x_st.st_mtime > workdir_st.st_mtime: |
| 38 |
writemsg_stdout(_(">>> Timestamp of " |
| 39 |
"%s has changed; recreating WORKDIR...\n") % x) |
| 40 |
newstuff = True |
Archives