aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 15:54:30 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 15:42:32 +0000
commit0000b1448329980553cae63bbc3ec62fb5688fb8 (patch)
tree577dd95b090ee426a18bc99d1722850ad2bfb173
parentf172211e73226dd52a7fd574de4efbb2d798133b (diff)
downloadpaludis-0000b1448329980553cae63bbc3ec62fb5688fb8.tar.gz
paludis-0000b1448329980553cae63bbc3ec62fb5688fb8.tar.xz
Use sensible names for skip phase messages
-rw-r--r--paludis/repositories/e/eapis/0.conf18
-rw-r--r--paludis/repositories/e/eapis/2.conf8
-rw-r--r--paludis/repositories/e/eapis/exheres-0.conf5
-rw-r--r--paludis/repositories/e/eapis/kdebuild-1.conf8
-rw-r--r--paludis/repositories/e/eapis/paludis-1.conf22
-rw-r--r--paludis/repositories/e/ebuild_entries.cc2
-rw-r--r--paludis/repositories/e/exndbam_repository.cc2
-rw-r--r--paludis/repositories/e/vdb_repository.cc2
8 files changed, 34 insertions, 33 deletions
diff --git a/paludis/repositories/e/eapis/0.conf b/paludis/repositories/e/eapis/0.conf
index 8d93d38..f498b13 100644
--- a/paludis/repositories/e/eapis/0.conf
+++ b/paludis/repositories/e/eapis/0.conf
@@ -30,12 +30,12 @@ vdb_from_env_variables = \
CATEGORY CHOST COUNTER DEPEND DESCRIPTION EAPI FEATURES \
HOMEPAGE INHERITED IUSE KEYWORDS LICENSE PDEPEND PF \
PROVIDE RDEPEND SLOT SRC_URI USE CONFIG_PROTECT CONFIG_PROTECT_MASK \
- VDB_FORMAT PKGMANAGER USE_EXPAND USE_EXPAND_HIDDEN DEFINED_PHASES
+ VDB_FORMAT PKGMANAGER USE_EXPAND USE_EXPAND_HIDDEN
vdb_from_env_unless_empty_variables = \
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX CXXFLAGS \
EXTRA_ECONF EXTRA_EINSTALL EXTRA_EMAKE LDFLAGS LIBCXXFLAGS \
- REPOSITORY RESTRICT PROPERTIES
+ REPOSITORY RESTRICT PROPERTIES DEFINED_PHASES
binary_from_env_variables = \
CHOST DEPEND DESCRIPTION EAPI HOMEPAGE IUSE LICENSE PDEPEND \
@@ -103,21 +103,21 @@ ebuild_functions = \
ebuild_install = \
: killold ; \
userpriv sandbox : init saveenv ; \
- skipifno=setup : loadenv setup saveenv ; \
+ skipname=setup skipifno=setup : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile saveenv ; \
sandbox userpriv optional_tests : loadenv test saveenv ; \
- skipifno=install sandbox : loadenv install saveenv ; \
+ skipname=install skipifno=install sandbox : loadenv install saveenv ; \
strip : ; \
- skipifno=preinst prepost : loadenv preinst saveenv ; \
+ skipname=preinst skipifno=preinst prepost : loadenv preinst saveenv ; \
merge : ; \
- skipifno=postinst prepost : loadenv postinst saveenv ; \
+ skipname=postinst skipifno=postinst prepost : loadenv postinst saveenv ; \
: tidyup
ebuild_uninstall = \
- skipifno=prerm,postrm : killoldrm ; \
- skipifno=prerm,postrm : initrm prerm saveenv ; \
+ skipname=killoldrm skipifno=prerm,postrm : killoldrm ; \
+ skipname=prerm skipifno=prerm,postrm : initrm prerm saveenv ; \
unmerge : ; \
- skipifno=prerm,postrm : loadenv postrm tidyuprm ;
+ skipname=postrm skipifno=prerm,postrm : loadenv postrm tidyuprm ;
ebuild_pretend =
diff --git a/paludis/repositories/e/eapis/2.conf b/paludis/repositories/e/eapis/2.conf
index 111769b..36d401b 100644
--- a/paludis/repositories/e/eapis/2.conf
+++ b/paludis/repositories/e/eapis/2.conf
@@ -14,14 +14,14 @@ ebuild_functions = ${ebuild_functions} src_prepare src_configure
ebuild_install = \
: killold ; \
userpriv sandbox : init saveenv ; \
- skipifno=setup : loadenv setup saveenv ; \
+ skipname=setup skipifno=setup : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack prepare configure compile saveenv ; \
sandbox userpriv optional_tests : loadenv test saveenv ; \
- skipifno=install sandbox : loadenv install saveenv ; \
+ skipname=install skipifno=install sandbox : loadenv install saveenv ; \
strip : ; \
- skipifno=preinst prepost : loadenv preinst saveenv ; \
+ skipname=preinst skipifno=preinst prepost : loadenv preinst saveenv ; \
merge : ; \
- skipifno=postinst prepost : loadenv postinst saveenv ; \
+ skipname=postinst skipifno=postinst prepost : loadenv postinst saveenv ; \
: tidyup
ebuild_new_upgrade_phase_order = true
diff --git a/paludis/repositories/e/eapis/exheres-0.conf b/paludis/repositories/e/eapis/exheres-0.conf
index 385b257..e584c8c 100644
--- a/paludis/repositories/e/eapis/exheres-0.conf
+++ b/paludis/repositories/e/eapis/exheres-0.conf
@@ -31,13 +31,14 @@ vdb_from_env_variables = \
CATEGORY CHOST DEPENDENCIES SUMMARY EAPI \
HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENCES PNVR \
SLOT DOWNLOADS OPTIONS CONFIG_PROTECT CONFIG_PROTECT_MASK \
- VDB_FORMAT PKGMANAGER SUBOPTIONS HIDDEN_SUBOPTIONS DEFINED_PHASES
+ VDB_FORMAT PKGMANAGER SUBOPTIONS HIDDEN_SUBOPTIONS
vdb_from_env_unless_empty_variables = \
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX CXXFLAGS \
EXTRA_ECONF EXTRA_EINSTALL EXTRA_EMAKE LDFLAGS LIBCXXFLAGS \
REPOSITORY RESTRICT BUGS_TO REMOTE_IDS UPSTREAM_CHANGELOG \
- UPSTREAM_RELEASE_NOTES UPSTREAM_DOCUMENTATION DESCRIPTION
+ UPSTREAM_RELEASE_NOTES UPSTREAM_DOCUMENTATION DESCRIPTION \
+ DEFINED_PHASES
binary_from_env_variables = \
CHOST DEPENDENCIES DESCRIPTION EAPI HOMEPAGE INHERITED MYOPTIONS PLATFORMS LICENCES \
diff --git a/paludis/repositories/e/eapis/kdebuild-1.conf b/paludis/repositories/e/eapis/kdebuild-1.conf
index fea0b58..c60eeae 100644
--- a/paludis/repositories/e/eapis/kdebuild-1.conf
+++ b/paludis/repositories/e/eapis/kdebuild-1.conf
@@ -28,14 +28,14 @@ flat_list_minimum_size = -1
ebuild_install = \
: killold ; \
userpriv sandbox : init saveenv ; \
- skipifno=setup : loadenv setup saveenv ; \
+ skipname=setup skipifno=setup : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile saveenv ; \
sandbox userpriv recommended_tests : loadenv test saveenv ; \
- skipifno=install sandbox : loadenv install saveenv ; \
+ skipname=install skipifno=install sandbox : loadenv install saveenv ; \
strip : ; \
- skipifno=preinst prepost : loadenv preinst saveenv ; \
+ skipname=preinst skipifno=preinst prepost : loadenv preinst saveenv ; \
merge : ; \
- skipifno=postinst prepost : loadenv postinst saveenv ; \
+ skipname=postinst skipifno=postinst prepost : loadenv postinst saveenv ; \
: tidyup
ebuild_info = \
diff --git a/paludis/repositories/e/eapis/paludis-1.conf b/paludis/repositories/e/eapis/paludis-1.conf
index a48aa31..bafa714 100644
--- a/paludis/repositories/e/eapis/paludis-1.conf
+++ b/paludis/repositories/e/eapis/paludis-1.conf
@@ -31,12 +31,12 @@ vdb_from_env_variables = \
CATEGORY CHOST COUNTER DEPEND DESCRIPTION EAPI FEATURES \
HOMEPAGE INHERITED IUSE KEYWORDS LICENSE PDEPEND PF \
PROVIDE RDEPEND SLOT SRC_URI USE CONFIG_PROTECT CONFIG_PROTECT_MASK \
- VDB_FORMAT PKGMANAGER USE_EXPAND USE_EXPAND_HIDDEN DEFINED_PHASES
+ VDB_FORMAT PKGMANAGER USE_EXPAND USE_EXPAND_HIDDEN
vdb_from_env_unless_empty_variables = \
ASFLAGS CBUILD CC CFLAGS CHOST CTARGET CXX CXXFLAGS \
EXTRA_ECONF EXTRA_EINSTALL EXTRA_EMAKE LDFLAGS LIBCXXFLAGS \
- REPOSITORY
+ REPOSITORY DEFINED_PHASES
binary_from_env_variables = \
CHOST DEPEND DESCRIPTION EAPI HOMEPAGE IUSE LICENSE PDEPEND \
@@ -105,25 +105,25 @@ ebuild_functions = \
ebuild_install = \
: killold ; \
userpriv sandbox : init saveenv ; \
- skipifno=setup sandbox : loadenv setup saveenv ; \
+ skipname=setup skipifno=setup sandbox : loadenv setup saveenv ; \
sandbox userpriv : loadenv unpack compile saveenv ; \
sandbox userpriv recommended_tests : loadenv test saveenv ; \
- skipifno=install sandbox : loadenv install saveenv ; \
+ skipname=install skipifno=install sandbox : loadenv install saveenv ; \
strip : ; \
- skipifno=preinst sandbox : loadenv preinst saveenv ; \
+ skipname=preinst skipifno=preinst sandbox : loadenv preinst saveenv ; \
merge : ; \
- skipifno=postinst sandbox : loadenv postinst saveenv ; \
+ skipname=postinst skipifno=postinst sandbox : loadenv postinst saveenv ; \
: tidyup
ebuild_uninstall = \
- skipifno=prerm,postrm : killoldrm ; \
- skipifno=prerm,postrm sandbox : initrm prerm saveenv ; \
+ skipname=killoldrm skipifno=prerm,postrm : killoldrm ; \
+ skipname=prerm skipifno=prerm,postrm sandbox : initrm prerm saveenv ; \
unmerge : ; \
- skipifno=prerm,postrm sandbox : loadenv postrm ; \
- skipifno=prerm,postrm : tidyuprm
+ skipname=postrm skipifno=prerm,postrm sandbox : loadenv postrm ; \
+ skipname=tidyuprm skipifno=prerm,postrm : tidyuprm
ebuild_pretend = \
- skipifno=pretend sandbox userpriv : pretend
+ skipname=pretend skipifno=pretend sandbox userpriv : pretend
ebuild_info = \
: killoldmisc ; \
diff --git a/paludis/repositories/e/ebuild_entries.cc b/paludis/repositories/e/ebuild_entries.cc
index eb06176..43d3794 100644
--- a/paludis/repositories/e/ebuild_entries.cc
+++ b/paludis/repositories/e/ebuild_entries.cc
@@ -625,7 +625,7 @@ EbuildEntries::install(const std::tr1::shared_ptr<const ERepositoryID> & id,
{
if (can_skip_phase(id, *phase))
{
- std::cout << "No need to do anything for " << phase->equal_option("skipifno") << " phase" << std::endl;
+ std::cout << "--- No need to do anything for " << phase->equal_option("skipname") << " phase" << std::endl;
continue;
}
diff --git a/paludis/repositories/e/exndbam_repository.cc b/paludis/repositories/e/exndbam_repository.cc
index 0720760..1a2c0e2 100644
--- a/paludis/repositories/e/exndbam_repository.cc
+++ b/paludis/repositories/e/exndbam_repository.cc
@@ -447,7 +447,7 @@ ExndbamRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositor
{
if (can_skip_phase(id, *phase))
{
- std::cout << "No need to do anything for " << phase->equal_option("skipifno") << " phase" << std::endl;
+ std::cout << "--- No need to do anything for " << phase->equal_option("skipname") << " phase" << std::endl;
continue;
}
diff --git a/paludis/repositories/e/vdb_repository.cc b/paludis/repositories/e/vdb_repository.cc
index f97ec5d..dae4f31 100644
--- a/paludis/repositories/e/vdb_repository.cc
+++ b/paludis/repositories/e/vdb_repository.cc
@@ -418,7 +418,7 @@ VDBRepository::perform_uninstall(const std::tr1::shared_ptr<const ERepositoryID>
{
if (can_skip_phase(id, *phase))
{
- std::cout << "No need to do anything for " << phase->equal_option("skipifno") << " phase" << std::endl;
+ std::cout << "--- No need to do anything for " << phase->equal_option("skipname") << " phase" << std::endl;
continue;
}