More updates from trunk...wheee.

svn path=/main/branches/prefix/; revision=2336

diff --git a/bin/dodoc b/bin/dodoc
index 0caad88f022567b41164afd6f7cbc4a18b602bee..aefec427f53feb5476ef56dda6f6cb531b601ee9 100755 (executable)
--- a/bin/dodoc
+++ b/bin/dodoc
@@ -13,11 +13,15 @@ if [ ! -d "${dir}" ] ; then
        install -d "${dir}"
 fi
 
+ret=0
 for x in "$@" ; do
        if [ -s "${x}" ] ; then
                install -m0644 "${x}" "${dir}"
                gzip -f -9 "${dir}/${x##*/}"
        elif [ ! -e "${x}" ] ; then
                echo "dodoc: ${x} does not exist" 1>&2
+               ((++ret))
        fi
 done
+
+exit ${ret}

diff --git a/bin/ebuild b/bin/ebuild
index 0ab5269835b1bb388d0aabe266b3436288233425..d495e9d0ab898fdd3c09822ad2e845ac11db99d8 100755 (executable)
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -5,8 +5,10 @@
 
 import getopt, os, sys
 
-if len(sys.argv)<=2:
-       print "expecting two arguments."
+if len(sys.argv) <= 2:
+       print "Usage: ebuild <ebuild file> <command> [command] ..."
+       print ""
+       print "See the ebuild(1) man page for more info"
        sys.exit(1)
 
 

diff --git a/bin/portageq b/bin/portageq
index 17a81a223c52d1115270674858179c6478a89593..e37dabcfe02d615c08852f1e675abc61ccbd0847 100755 (executable)
--- a/bin/portageq
+++ b/bin/portageq
@@ -202,7 +202,7 @@ def envvar(argv):
 # DO NOT CHANGE CODE BEYOND THIS POINT - IT'S NOT NEEDED!
 #
 
-def usage():
+def usage(argv):
        rev="$Revision: 1.13.2.1 $"
        ver=string.split(rev, ' ')[1]
        print ">>> Portage information query tool -- version "+ver
@@ -239,7 +239,7 @@ def usage():
 
 def main():
        if (len(sys.argv) < 2):
-               usage()
+               usage(sys.argv)
                sys.exit()
        
        cmd = sys.argv[1]

diff --git a/bin/quickpkg b/bin/quickpkg
index a02e66e5eb2ca2444a8eb621063e05ddb3979c43..45df6a193c5ea2ffd844b9c1f6d99148e9c543f8 100755 (executable)
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -37,7 +37,7 @@ fi
 export PKGDIR=$(portageq envvar PKGDIR)
 export PORTAGE_TMPDIR=$(portageq envvar PORTAGE_TMPDIR)
 
-source @PORTAGE_BASE@/bin/isolated-functions.sh
+source @PORTAGE_BASE@/sbin/functions.sh
 
 # here we make a package given a little info
 # $1 = package-name w/version