summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2008-04-27 08:22:29 +0000
committerMarius Mauch <genone@gentoo.org>2008-04-27 08:22:29 +0000
commitd4f22b42378b7db7ac33c4a40b33a54d83840233 (patch)
tree80617d628520f64f6f5d6d83775b30cfcc40ef93 /bin
parentTake the classes that initialize variables in __slots__ with keyword (diff)
downloadportage-multirepo-d4f22b42378b7db7ac33c4a40b33a54d83840233.tar.gz
portage-multirepo-d4f22b42378b7db7ac33c4a40b33a54d83840233.tar.bz2
portage-multirepo-d4f22b42378b7db7ac33c4a40b33a54d83840233.zip
some minor code fixes
svn path=/main/trunk/; revision=9996
Diffstat (limited to 'bin')
-rwxr-xr-xbin/misc-functions.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index c5952926..995ec0b3 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -159,11 +159,11 @@ install_qa_check() {
fi
# Save NEEDED information after removing self-contained providers
- scanelf -qyRF '%a;%p;%S;%r;%n' "${D}" | { while read l; do
+ scanelf -qyRF '%a;%p;%S;%r;%n' "${D}" | { while IFS= read l; do
arch=${l%%;*}; l=${l#*;}
obj="/${l%%;*}"; l=${l#*;}
soname=${l%%;*}; l=${l#*;}
- rpath=${l%%;*}; l=${l#*;}; [ "${rpath}" == " - " ] && rpath=""
+ rpath=${l%%;*}; l=${l#*;}; [ "${rpath}" = " - " ] && rpath=""
needed=${l%%;*}; l=${l#*;}
if [ -z "${rpath}" -o -n "${rpath//*ORIGIN*}" ]; then
# object doesn't contain $ORIGIN in its runpath attribute
@@ -181,7 +181,7 @@ install_qa_check() {
rneeded=${rneeded:1}
if [ -n "${rneeded}" ]; then
echo "${obj} ${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED
- echo "${arch:3};/${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2
+ echo "${arch:3};${obj};${soname};${rpath};${rneeded}" >> "${PORTAGE_BUILDDIR}"/build-info/NEEDED.2
fi
fi
done }