diff options
| author |   Brandon Low <lostlogic@gentoo.org> | 2002-06-26 22:14:37 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@gentoo.org> | 2002-06-26 22:14:37 +0000 |
| commit | d0422a361a89873354b3fcbf435d8d6155688b9c (patch) | |
| tree | 21edb2ca620cb0e04d2e2bca0855f627ea374f67 /app-admin | |
| parent | new release of cronbase. that way everybody gets the new and improved run-crons (diff) | |
| download | gentoo-2-d0422a361a89873354b3fcbf435d8d6155688b9c.tar.gz gentoo-2-d0422a361a89873354b3fcbf435d8d6155688b9c.tar.bz2 gentoo-2-d0422a361a89873354b3fcbf435d8d6155688b9c.zip | |
minor bug in --dups sorting
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/gentoolkit/files/scripts/qpkg | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app-admin/gentoolkit/files/scripts/qpkg b/app-admin/gentoolkit/files/scripts/qpkg index cf7db6fa2b04..602f56a77f68 100644 --- a/app-admin/gentoolkit/files/scripts/qpkg +++ b/app-admin/gentoolkit/files/scripts/qpkg @@ -7,8 +7,8 @@ # # Maintainer: Brandon Low <lostlogic@gentoo.org> # -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.11 2002/06/26 04:20:21 lostlogic Exp $ -ID='$Id: qpkg,v 1.11 2002/06/26 04:20:21 lostlogic Exp $' +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.12 2002/06/26 22:14:37 lostlogic Exp $ +ID='$Id: qpkg,v 1.12 2002/06/26 22:14:37 lostlogic Exp $' VERSION=0.`echo ${ID} | cut -d\ -f3` PROG=`basename ${0}` @@ -230,12 +230,12 @@ if [ "${dups}" ]; then #Package basename NAME=`echo "${PKG}"|sed -e "s:\.ebuild$::" \ -e "s:-r[0-9]\+$::" \ - -e "s:-[0-9][^-]*$::"` + -e "s:-[0-9].*$::"` echo "${NUM} ${PKG} ${NAME}${SLOT}" #Finish loop, and sort that nice sortable file based on #installation order, and then based on package basename #bash hates me so I decided to use a temp file - done |sort -t " " -k1g,2 |sort -t " " -k3|uniq -D -2> /tmp/qpkg.lst + done |sort -t" " -k3 -k1g,2|uniq -D -f2 > /tmp/qpkg.lst duppak=`cat /tmp/qpkg.lst` rm /tmp/qpkg.lst |