aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-21 09:13:34 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-21 09:13:34 +0000
commitf399011a936517fa3c88a8672124a39e747c1fd6 (patch)
treefaa3b81e53422419f794d3973f25e0c47febfe00
parent528a64c6fcf47774757494ed66387d2ba636090b (diff)
downloadpaludis-f399011a936517fa3c88a8672124a39e747c1fd6.tar.gz
paludis-f399011a936517fa3c88a8672124a39e747c1fd6.tar.xz
Make PALUDIS_DO_NOTHING_SANDBOXY work properly...
-rw-r--r--ebuild/builtin_fetch.bash1
-rw-r--r--ebuild/builtin_fetch_bin.bash1
-rw-r--r--ebuild/builtin_merge.bash1
-rw-r--r--ebuild/builtin_unmerge.bash1
-rwxr-xr-xebuild/ebuild.bash1
-rw-r--r--ebuild/pkg_nofetch.bash1
-rw-r--r--ebuild/pkg_postinst.bash1
-rw-r--r--ebuild/pkg_postrm.bash1
-rw-r--r--ebuild/pkg_preinst.bash1
-rw-r--r--ebuild/pkg_prerm.bash1
-rw-r--r--ebuild/pkg_setup.bash1
-rw-r--r--ebuild/src_test.bash1
-rw-r--r--paludis/util/system.cc2
13 files changed, 13 insertions, 1 deletions
diff --git a/ebuild/builtin_fetch.bash b/ebuild/builtin_fetch.bash
index a43238c..6cd84f8 100644
--- a/ebuild/builtin_fetch.bash
+++ b/ebuild/builtin_fetch.bash
@@ -127,6 +127,7 @@ ebuild_f_fetch()
ebuild_section "Done builtin_fetch"
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/builtin_fetch_bin.bash b/ebuild/builtin_fetch_bin.bash
index d0a6b5c..ccfe687 100644
--- a/ebuild/builtin_fetch_bin.bash
+++ b/ebuild/builtin_fetch_bin.bash
@@ -76,6 +76,7 @@ ebuild_f_fetch_bin()
ebuild_section "Done builtin_fetch_bin"
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index 0231499..4903513 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -124,5 +124,6 @@ ebuild_f_merge()
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_ON="${old_sandbox_on}"
+ true
}
diff --git a/ebuild/builtin_unmerge.bash b/ebuild/builtin_unmerge.bash
index 3e550b4..89ca631 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/ebuild/builtin_unmerge.bash
@@ -103,6 +103,7 @@ ebuild_f_unmerge()
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_ON="${old_sandbox_on}"
+ true
}
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 6d9e293..2ad95b9 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -230,6 +230,7 @@ perform_hook()
done
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && export SANDBOX_ON="${old_sandbox_on}"
+ true
}
ebuild_main()
diff --git a/ebuild/pkg_nofetch.bash b/ebuild/pkg_nofetch.bash
index 1d9298b..3bc6c51 100644
--- a/ebuild/pkg_nofetch.bash
+++ b/ebuild/pkg_nofetch.bash
@@ -59,4 +59,5 @@ ebuild_f_nofetch()
fi
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/pkg_postinst.bash b/ebuild/pkg_postinst.bash
index 2cf1a7f..84c5e18 100644
--- a/ebuild/pkg_postinst.bash
+++ b/ebuild/pkg_postinst.bash
@@ -42,5 +42,6 @@ ebuild_f_postinst()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/pkg_postrm.bash b/ebuild/pkg_postrm.bash
index d5bb285..5bb6b9e 100644
--- a/ebuild/pkg_postrm.bash
+++ b/ebuild/pkg_postrm.bash
@@ -42,6 +42,7 @@ ebuild_f_postrm()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/pkg_preinst.bash b/ebuild/pkg_preinst.bash
index 7b3a085..5e3b62b 100644
--- a/ebuild/pkg_preinst.bash
+++ b/ebuild/pkg_preinst.bash
@@ -42,5 +42,6 @@ ebuild_f_preinst()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/pkg_prerm.bash b/ebuild/pkg_prerm.bash
index d94bab0..4a3b8b6 100644
--- a/ebuild/pkg_prerm.bash
+++ b/ebuild/pkg_prerm.bash
@@ -42,5 +42,6 @@ ebuild_f_prerm()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/pkg_setup.bash b/ebuild/pkg_setup.bash
index d21eb5e..3da75de 100644
--- a/ebuild/pkg_setup.bash
+++ b/ebuild/pkg_setup.bash
@@ -42,5 +42,6 @@ ebuild_f_setup()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_WRITE="${old_sandbox_write}"
+ true
}
diff --git a/ebuild/src_test.bash b/ebuild/src_test.bash
index b041747..479bf14 100644
--- a/ebuild/src_test.bash
+++ b/ebuild/src_test.bash
@@ -55,5 +55,6 @@ ebuild_f_test()
fi
[[ -z "${PALUDIS_DO_NOTHING_SANDBOXY}" ]] && SANDBOX_PREDICT="${old_sandbox_predict}"
+ true
}
diff --git a/paludis/util/system.cc b/paludis/util/system.cc
index 10126b3..fa46c7d 100644
--- a/paludis/util/system.cc
+++ b/paludis/util/system.cc
@@ -217,7 +217,7 @@ paludis::make_sandbox_command(const std::string & cmd)
#if HAVE_SANDBOX
if (! getenv_with_default("PALUDIS_DO_NOTHING_SANDBOXY", "").empty())
{
- Log::get_instance()->message(ll_warning, lc_no_context,
+ Log::get_instance()->message(ll_debug, lc_no_context,
"PALUDIS_DO_NOTHING_SANDBOXY is set, not using sandbox");
return cmd;
}