aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-03 01:51:44 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-03 17:08:25 +0000
commit7f8a902f8314dcbbae6454dfed8fb6f4490b19e9 (patch)
tree1e7e2cfc89b3bce28914b0d58dd040bef905d80a
parent5f4310c4996c12fadbb94eab5da0f34389343d73 (diff)
downloadpaludis-7f8a902f8314dcbbae6454dfed8fb6f4490b19e9.tar.gz
paludis-7f8a902f8314dcbbae6454dfed8fb6f4490b19e9.tar.xz
Make phase resumes with build start time work
-rw-r--r--paludis/repositories/e/e_repository.cc3
-rw-r--r--paludis/repositories/e/ebuild/0/builtin_init.bash3
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/builtin_init.bash3
3 files changed, 5 insertions, 4 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 8c4b342..d25f260 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -2183,8 +2183,6 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
+ join(indirect_iterator(install_action.options.replacing()->begin()),
indirect_iterator(install_action.options.replacing()->end()), "', '") + "' }") + ":");
- Timestamp build_start_time(Timestamp::now());
-
std::tr1::shared_ptr<OutputManager> output_manager(install_action.options.make_output_manager()(install_action));
bool userpriv_restrict, test_restrict, strip_restrict;
@@ -2337,6 +2335,7 @@ ERepository::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
if (preserve_work_choice && preserve_work_choice->enabled())
extra_merger_options += mo_nondestructive;
+ Timestamp build_start_time(FSEntry(package_builddir / "temp" / "build_start_time").mtim());
(*install_action.options.destination()).destination_interface()->merge(
make_named_values<MergeParams>(
value_for<n::build_start_time>(build_start_time),
diff --git a/paludis/repositories/e/ebuild/0/builtin_init.bash b/paludis/repositories/e/ebuild/0/builtin_init.bash
index 5c9659f..ec049bb 100644
--- a/paludis/repositories/e/ebuild/0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/0/builtin_init.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007, 2008, 2009 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
@@ -63,6 +63,7 @@ builtin_init()
declare -r T="${T}"
export HOME="${T}"
export TMPDIR="${T}"
+ touch ${TMPDIR}/build_start_time
export D="${PALUDIS_PACKAGE_BUILDDIR}/image/"
export D="${D//+(\/)//}"
diff --git a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
index daab9be..12cd3e7 100644
--- a/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
+++ b/paludis/repositories/e/ebuild/exheres-0/builtin_init.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# vim: set sw=4 sts=4 et :
-# Copyright (c) 2006, 2007, 2008 Ciaran McCreesh
+# Copyright (c) 2006, 2007, 2008, 2010 Ciaran McCreesh
#
# This file is part of the Paludis package manager. Paludis is free software;
# you can redistribute it and/or modify it under the terms of the GNU General
@@ -63,6 +63,7 @@ builtin_init()
declare -r TEMP="${TEMP}"
export HOME="${TEMP}"
export TMPDIR="${TEMP}"
+ touch ${TMPDIR}/build_start_time
export IMAGE="${PALUDIS_PACKAGE_BUILDDIR}/image/"
export IMAGE="${IMAGE//+(\/)//}"