diff options
| author | genone <genone@gentoo.org> | 2005-04-08 00:06:46 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2005-04-08 00:06:46 +0000 |
| commit | 56a3c7840eb2700b2af3b9ffa93fb89ae602d843 (patch) | |
| tree | 063a1fe047c6aadbf59a75bf7aef313df087a119 /trunk/src | |
| parent | b70beb69251d0abf7802fe24ecda4ede67d163dc (diff) | |
| download | gentoolkit-56a3c7840eb2700b2af3b9ffa93fb89ae602d843.tar.gz | |
fixing euse bugs 75525, 74344 and 84521
svn path=/; revision=203
Diffstat (limited to 'trunk/src')
| -rwxr-xr-x | trunk/src/euse/euse | 7 | ||||
| -rw-r--r-- | trunk/src/glsa-check/Makefile | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/trunk/src/euse/euse b/trunk/src/euse/euse index f2972ad..d663233 100755 --- a/trunk/src/euse/euse +++ b/trunk/src/euse/euse @@ -47,6 +47,7 @@ parse_arguments() { error() { echo "ERROR: ${1}" + set +f exit 1 } @@ -58,7 +59,7 @@ check_sanity() { [ ! -r "${MAKE_CONF_PATH}" ] && error "${MAKE_CONF_PATH} is not readable" [ ! -r "${MAKE_GLOBALS_PATH}" ] && error "${MAKE_GLOBALS_PATH} is not readable" - [ ! -s "${MAKE_PROFILE_PATH}" ] && error "${MAKE_PROFILE_PATH} is not a symlink" + [ ! -h "${MAKE_PROFILE_PATH}" ] && error "${MAKE_PROFILE_PATH} is not a symlink" [ -z "$(get_portdir)" ] && error "\$PORTDIR couldn't be determined" [ ! -d "${descdir}" ] && error "${descdir} does not exist or is not a directory" [ ! -r "${descdir}/use.desc" ] && error "${descdir}/use.desc is not readable" @@ -154,7 +155,7 @@ get_make_defaults() { curdir="$(readlink -f ${MAKE_PROFILE_PATH})" while [ ! -f "${curdir}/make.defaults" -a -f "${curdir}/parent" ]; do - parent="$(grep -v '(^#|^ *$)' ${curdir}/parent)" + parent="$(egrep -v '(^#|^ *$)' ${curdir}/parent)" curdir="$(readlink -f ${curdir}/${parent})" done @@ -383,7 +384,9 @@ modify() { ##### main program comes now ##### +set -f parse_arguments "$@" check_sanity eval ${MODE} ${ARGUMENTS} +set +f diff --git a/trunk/src/glsa-check/Makefile b/trunk/src/glsa-check/Makefile index 8c6fa6d..a3f1044 100644 --- a/trunk/src/glsa-check/Makefile +++ b/trunk/src/glsa-check/Makefile @@ -14,5 +14,6 @@ dist: cp Makefile glsa.py glsa-check ../../$(distdir)/src/glsa-check/ install: + install -d $(DESTDIR)/usr/lib/gentoolkit/pym/ install -m 0755 glsa-check $(bindir)/ install -m 0644 glsa.py $(DESTDIR)/usr/lib/gentoolkit/pym/ |