diff options
| author | genone <genone@gentoo.org> | 2004-02-06 22:37:58 +0000 |
|---|---|---|
| committer | genone <genone@gentoo.org> | 2004-02-06 22:37:58 +0000 |
| commit | fa07cbc87a1ef98355979aea13b066dbe76c8a16 (patch) | |
| tree | e64ddd976fa0f72fa81537ad8f1582c8c001f754 /trunk | |
| parent | 772c92e525696aeb7f04c9a909b0d229a6e3bd14 (diff) | |
| download | gentoolkit-fa07cbc87a1ef98355979aea13b066dbe76c8a16.tar.gz | |
deprecation notice for qpkg+etcat, small fix for equery with amigious package
svn path=/; revision=78
Diffstat (limited to 'trunk')
| -rwxr-xr-x | trunk/src/equery/equery | 2 | ||||
| -rwxr-xr-x | trunk/src/etcat/etcat | 3 | ||||
| -rw-r--r-- | trunk/src/qpkg/qpkg | 11 |
3 files changed, 13 insertions, 3 deletions
diff --git a/trunk/src/equery/equery b/trunk/src/equery/equery index 3ae4d9d..fa7e2e6 100755 --- 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 5ae5956..71afdff 100755 --- 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 f7bd7bc..78aadc0 100644 --- 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})/} |