aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2010-02-20 21:52:11 +0000
committerAvatar Bo ├śrsted Andresen <bo.andresen@zlin.dk> 2010-02-20 22:35:31 +0000
commitae4abad908a52441d60e52bd85cfca0960c54e0f (patch)
treee064a320a113b028ab1fb8f4f68b8c862bdce940
parent565177febb8111cd6af24cfec1ba7935bb0a4e5f (diff)
downloadpaludis-ae4abad908a52441d60e52bd85cfca0960c54e0f.tar.gz
paludis-ae4abad908a52441d60e52bd85cfca0960c54e0f.tar.xz
Ban fperms and fowners in exheres-0.
-rw-r--r--.gitignore2
-rw-r--r--paludis/repositories/e/e_repository_TEST_exheres_0.cc45
-rwxr-xr-xpaludis/repositories/e/e_repository_TEST_exheres_0_setup.sh88
-rw-r--r--paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am4
4 files changed, 5 insertions, 134 deletions
diff --git a/.gitignore b/.gitignore
index ae04456..351e2a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -245,6 +245,8 @@ paludis-*.*.*.tar.bz2
/paludis/repositories/e/ebuild/utils/exheres-0/dosed
/paludis/repositories/e/ebuild/utils/exheres-0/ecompress
/paludis/repositories/e/ebuild/utils/exheres-0/ecompressdir
+/paludis/repositories/e/ebuild/utils/exheres-0/fperms
+/paludis/repositories/e/ebuild/utils/exheres-0/fowners
/paludis/repositories/e/ebuild/utils/exheres-0/install
/paludis/repositories/e/ebuild/utils/exheres-0/prepall
/paludis/repositories/e/ebuild/utils/exheres-0/prepalldocs
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0.cc b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
index 067e3b1..95530c0 100644
--- a/paludis/repositories/e/e_repository_TEST_exheres_0.cc
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0.cc
@@ -535,51 +535,6 @@ namespace test_cases
}
{
- TestMessageSuffix suffix("fperms success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("cat/fperms-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
- TEST_CHECK(id);
- id->perform_action(action);
- }
-
- {
- TestMessageSuffix suffix("fperms fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("cat/fperms-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
- TEST_CHECK(id);
- TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
- }
-
- {
- TestMessageSuffix suffix("nonfatal fperms success", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-success",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
- TEST_CHECK(id);
- id->perform_action(action);
- }
-
- {
- TestMessageSuffix suffix("nonfatal fperms fail", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-fail",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
- TEST_CHECK(id);
- id->perform_action(action);
- }
-
- {
- TestMessageSuffix suffix("nonfatal fperms die", true);
- const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
- PackageDepSpec(parse_user_package_dep_spec("cat/nonfatal-fperms-die",
- &env, UserPackageDepSpecOptions())), MatchPackageOptions()))]->last());
- TEST_CHECK(id);
- TEST_CHECK_THROWS(id->perform_action(action), ActionFailedError);
- }
-
- {
TestMessageSuffix suffix("best version", true);
const std::tr1::shared_ptr<const PackageID> id(*env[selection::RequireExactlyOne(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec("=cat/best-version-0",
diff --git a/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh b/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
index 1bf64e6..2e6c78e 100755
--- a/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
+++ b/paludis/repositories/e/e_repository_TEST_exheres_0_setup.sh
@@ -786,94 +786,6 @@ blah
EOF
}
END
-mkdir -p "packages/cat/fperms-success"
-cat <<'END' > packages/cat/fperms-success/fperms-success-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_compile() {
- touch foo
-}
-
-src_install() {
- fperms 755 foo
-}
-END
-mkdir -p "packages/cat/fperms-fail"
-cat <<'END' > packages/cat/fperms-fail/fperms-fail-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
- fperms 755 monkey
-}
-END
-mkdir -p "packages/cat/nonfatal-fperms-success"
-cat <<'END' > packages/cat/nonfatal-fperms-success/nonfatal-fperms-success-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_compile() {
- touch foo
-}
-
-src_install() {
- nonfatal fperms 755 foo || die
-}
-END
-mkdir -p "packages/cat/nonfatal-fperms-fail"
-cat <<'END' > packages/cat/nonfatal-fperms-fail/nonfatal-fperms-fail-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
- nonfatal fperms 755 monkey
-}
-END
-mkdir -p "packages/cat/nonfatal-fperms-die"
-cat <<'END' > packages/cat/nonfatal-fperms-die/nonfatal-fperms-die-1.ebuild || exit 1
-DESCRIPTION="The Long Description"
-SUMMARY="The Short Description"
-HOMEPAGE="http://example.com/"
-DOWNLOADS=""
-SLOT="0"
-MYOPTIONS="spork"
-LICENCES="GPL-2"
-PLATFORMS="test"
-WORK="${WORKBASE}"
-
-src_install() {
- nonfatal fperms 755 monkey || die
-}
-END
mkdir -p "packages/cat/best-version"
cat <<'END' > packages/cat/best-version/best-version-0.ebuild || exit 1
DESCRIPTION="The Long Description"
diff --git a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
index ba43d43..2892574 100644
--- a/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/utils/exheres-0/Makefile.am
@@ -10,6 +10,8 @@ libexecprog_SCRIPTS = \
dolib \
dosed \
donewins \
+ fperms \
+ fowners \
herebin \
hereconfd \
hereenvd \
@@ -42,7 +44,7 @@ EXTRA_DIST = \
bannedscripts = prepall prepallstrip prepstrip prepallman prepman prepallinfo \
prepinfo prepdocs prepalldocs dohard donewins dosed dohtml \
- ecompress ecompressdir
+ ecompress ecompressdir fperms fowners
CLEANFILES += $(bannedscripts)