deprecation notice for qpkg+etcat, small fix for equery with amigious package

svn path=/; revision=78

diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery
index 3ae4d9d472acd76de0773bf18bac4ccc3c33b444..fa7e2e6a498c148d703a643a093172cc86acf3a6 100755 (executable)
--- a/trunk/src/equery/equery
+++ b/trunk/src/equery/equery
@@ -939,7 +939,7 @@ if __name__ == "__main__":
                        sys.exit(2)
                except ValueError, e:
                        if type(e[0]) == types.ListType:
-                               print red("!!!"), "Ambiguous package name \"%s\"" % query
+                               print red("!!!"), "Ambiguous package name \"%s\"" % local_opts[0]
                                print red("!!!"), "Please use one of the following long names:"
                                for p in e[0]:
                                        print red("!!!"), "    "+p

diff --git a/trunk/src/etcat/etcat b/trunk/src/etcat/etcat
index 5ae5956bbeff3cfef2e0216469c290b00e9dd869..71afdfff7d1e2b50d5c9f6f372e5ef46447802b2 100755 (executable)
--- a/trunk/src/etcat/etcat
+++ b/trunk/src/etcat/etcat
@@ -579,6 +579,9 @@ def help():
        margin_ex = 8
        
        ver()
+       print yellow("NOTICE: ") + "This tool will be phased out at some point in"
+       print "        the future, please use equery instead."
+       print "        Bugs are still fixed, but new features won't be added."
        print
        print white("Usage: ") + turquoise(__productname__) + " [ " + green("options") + " ] [ " + turquoise("action") + " ] [ " + turquoise("package") + " ]"
        print

diff --git a/trunk/src/qpkg/qpkg b/trunk/src/qpkg/qpkg
index f7bd7bc7956a5e1db4941e124b75b37d72f194c4..78aadc03ef44c7fdc327b5e3a6021273c081fa97 100644 (file)
--- a/trunk/src/qpkg/qpkg
+++ b/trunk/src/qpkg/qpkg
@@ -164,6 +164,10 @@ find packages owning files on your filesystem, check the integrity
 of installed packages, and do other queries against installed or
 uninstalled packages.
 
+NOTICE: This tool will be phased out at some point in the 
+        future, please use equery instead.
+        Bugs are still fixed but new features won't be added.
+
 ${BR}Usage:
 ${T}${CY}${PROG}${NO} [${BR}options${NO}] [${YL}pkgname${NO}] [${BL}-g${YL} group${NO}] [${BL}-f${YL} <file>${NO}|${BL}-fp${YL} <pattern>${NO}]
 ${T}${CY}${PROG}${NO} ${BL}--dups${NO} [${BL}--slot${NO}]
@@ -373,8 +377,11 @@ for p in ${ipak} ${upak} -;do
        fi
        
        if [ "${info}" ]; then
-               home=`grep HOMEPAGE ${p}| cut -d\" -f2`
-               desc=`grep DESCRIPTION ${p}| cut -d\" -f2`
+               source ${p} 2> /dev/null
+               home="${HOMEPAGE}"
+               desc="${DESCRIPTION}"
+               #home=`grep HOMEPAGE ${p}| cut -d\" -f2`
+               #desc=`grep DESCRIPTION ${p}|cut -d= -f2-|cat`
                echo -e "${T}${BL}${desc}${NO} [ ${YL}${home}${NO} ]"
                if [ ${verb} -gt 0 ]; then
                        pdir=${p/$(basename ${p})/}