aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-01 17:00:18 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-08-01 17:00:18 +0100
commitc929ffe552fec9262a6afa392bdf19c46ada9c00 (patch)
treec88b96498027000f9cbec07a00c34280b0a9de6b
parent135185f2d181f45fbb1a22605d31b67c338e4919 (diff)
downloadpaludis-c929ffe552fec9262a6afa392bdf19c46ada9c00.tar.gz
paludis-c929ffe552fec9262a6afa392bdf19c46ada9c00.tar.xz
Fix disable-pbinnery
-rw-r--r--paludis/tar_merger.cc2
-rw-r--r--src/clients/cave/resolve_common.cc2
2 files changed, 3 insertions, 1 deletions
diff --git a/paludis/tar_merger.cc b/paludis/tar_merger.cc
index caccfb0..ee71102 100644
--- a/paludis/tar_merger.cc
+++ b/paludis/tar_merger.cc
@@ -58,7 +58,7 @@ namespace
TarMergerHandle()
{
-#if ! ENABLE_PBINS
+#ifndef ENABLE_PBINS
throw NotAvailableError("Paludis was built without support for pbins");
#endif
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 52aefe8..8f369d7 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -310,9 +310,11 @@ namespace
const Generator & g,
const std::shared_ptr<const Resolution> &)
{
+#ifdef ENABLE_PBINS
if (resolution_options.a_make.argument() == "binaries")
return g | BinaryableFilter();
else
+#endif
return g;
}