diff options
author | Mike Frysinger <vapier@gentoo.org> | 2012-02-29 19:18:09 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-01 00:27:36 -0500 |
commit | a0721f00c837abdc835843dc44d23a967d96dba4 (patch) | |
tree | 902c4a16bc04ebf5942705fbd566bf24ce404460 /crossdev | |
parent | crossdev: tell users what to post when a build fails (diff) | |
download | crossdev-a0721f00c837abdc835843dc44d23a967d96dba4.tar.gz crossdev-a0721f00c837abdc835843dc44d23a967d96dba4.tar.bz2 crossdev-a0721f00c837abdc835843dc44d23a967d96dba4.zip |
crossdev: reject flat files in PORTAGE_CONFIGROOT
It's getting to be too much of a hassle to support flat files in
PORTAGE_CONFIGROOT (I'm lazy), so start rejecting setups that try
to do that. It's trivial for people to convert over to dirs.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'crossdev')
-rwxr-xr-x | crossdev | 14 |
1 files changed, 5 insertions, 9 deletions
@@ -310,14 +310,10 @@ uninstall() { [[ -d ${CROSSDEV_OVERLAY}/cross-${CTARGET} ]] \ && rm -r ${CROSSDEV_OVERLAY}/cross-${CTARGET} + local f for f in categories package.{mask,keywords,use} profile/package.use.{force,mask} ; do - f="${CONFIGROOT}/${f}" - if [[ -d ${f} ]] ; then - rm -f "${f}"/cross-${CTARGET} - rmdir "${f}" 2>/dev/null - elif [[ -f ${f} ]] ; then - sed -i -r -e "/^cross-${CTARGET}(\/|$)/d" "${f}" - fi + rm -f "${f}"/cross-${CTARGET} + rmdir "${f}" 2>/dev/null done rm -rf "${CONFIGROOT}"/env/cross-${CTARGET} rmdir "${CONFIGROOT}"/env 2>/dev/null @@ -899,8 +895,8 @@ grep -qs "^cross-${CTARGET}$" "${CONFIGROOT}"/categories \ mkdir -p "${CROSSDEV_OVERLAY}"/cross-${CTARGET} || exit 1 cd "${CONFIGROOT}" for f in package.{keywords,mask,use} env/cross-${CTARGET} profile/package.use.{force,mask} ; do - [[ -f ${f} ]] && continue - mkdir -p ${f} || exit 1 + [[ -f ${f} ]] && die "please convert ${CONFIGROOT}/${f} to a directory" + mkdir -p ${f} || die "wtf!?" rm -f ${f}/cross-${CTARGET} done |