| 1 |
The doebuild function has a boolean "unpacked" variable which it sets |
| 2 |
to True if it determines that the "unpack" phase has already executed |
| 3 |
and the last modification times of the distfiles are older than the |
| 4 |
last modification time of WORKDIR. The code which sets the "unpacked" |
| 5 |
flag does not need to run unless the current phase is supposed to have |
| 6 |
a build directory. Therefore, disable this code for all phases that are |
| 7 |
not supposed to have a build directory. This fixes incorrect behavior |
| 8 |
of the "fetch" phase as reported in bug #528272. |
| 9 |
|
| 10 |
X-Gentoo-Bug: 528272 |
| 11 |
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=528272 |
| 12 |
--- |
| 13 |
pym/portage/package/ebuild/doebuild.py | 3 ++- |
| 14 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 17 |
index 544d193..6df3c69 100644 |
| 18 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 19 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 20 |
@@ -829,7 +829,8 @@ def doebuild(myebuild, mydo, _unused=DeprecationWarning, settings=None, debug=0, |
| 21 |
alist = set(mysettings.configdict["pkg"].get("A", "").split()) |
| 22 |
|
| 23 |
unpacked = False |
| 24 |
- if tree != "porttree": |
| 25 |
+ if tree != "porttree" or \ |
| 26 |
+ mydo in _doebuild_commands_without_builddir: |
| 27 |
pass |
| 28 |
elif "unpack" not in phases_to_run: |
| 29 |
unpacked = os.path.exists(os.path.join( |
| 30 |
-- |
| 31 |
2.0.4 |
Archives