aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-29 19:24:59 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-31 11:36:05 +0100
commit52d4cbb8a802dc023d7e2e554350dd7f0aae5122 (patch)
tree324a351b0e629b72c71b47d9f0fb6c086992aa5b
parent064c194b7cd54c9b7a58ffce14896ff5488ff767 (diff)
downloadpaludis-52d4cbb8a802dc023d7e2e554350dd7f0aae5122.tar.gz
paludis-52d4cbb8a802dc023d7e2e554350dd7f0aae5122.tar.xz
Don't use libarchive's bz2 for now, it's b0rked
-rw-r--r--paludis/repositories/e/e_repository.cc6
-rw-r--r--paludis/repositories/e/pbin_merger.cc2
2 files changed, 6 insertions, 2 deletions
diff --git a/paludis/repositories/e/e_repository.cc b/paludis/repositories/e/e_repository.cc
index 3a8414d..8c5c04e 100644
--- a/paludis/repositories/e/e_repository.cc
+++ b/paludis/repositories/e/e_repository.cc
@@ -2725,7 +2725,7 @@ ERepository::merge(const MergeParams & m)
n::output_manager() = m.output_manager(),
n::package_id() = m.package_id(),
n::root() = FSEntry("/"),
- n::tar_file() = _imp->params.binary_distdir() / (bin_dist_base + ".tar.bz2")
+ n::tar_file() = _imp->params.binary_distdir() / (bin_dist_base + ".tar")
));
if (! merger.check())
@@ -2733,6 +2733,10 @@ ERepository::merge(const MergeParams & m)
merger.merge();
+ Command compress_cmd("bzip2 " + stringify(_imp->params.binary_distdir() / (bin_dist_base + ".tar")));
+ if (0 != run_command(compress_cmd))
+ throw ActionFailedError("Compressing tarball failed");
+
FSEntry binary_ebuild_location(layout()->binary_ebuild_location(
m.package_id()->name(), m.package_id()->version(),
"pbin-1+" + std::static_pointer_cast<const ERepositoryID>(m.package_id())->eapi()->name()));
diff --git a/paludis/repositories/e/pbin_merger.cc b/paludis/repositories/e/pbin_merger.cc
index 25c55ec..9d7e9fc 100644
--- a/paludis/repositories/e/pbin_merger.cc
+++ b/paludis/repositories/e/pbin_merger.cc
@@ -63,7 +63,7 @@ namespace
PbinMerger::PbinMerger(const PbinMergerParams & p) :
Pimp<PbinMerger>(p),
TarMerger(make_named_values<TarMergerParams>(
- n::compression() = tmc_bz2,
+ n::compression() = tmc_none,
n::environment() = p.environment(),
n::fix_mtimes_before() = p.fix_mtimes_before(),
n::get_new_ids_or_minus_one() = std::bind(&get_new_ids_or_minus_one, p.environment(), std::placeholders::_1),