diff options
| author |   Brandon Low <lostlogic@gentoo.org> | 2002-06-05 02:45:33 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@gentoo.org> | 2002-06-05 02:45:33 +0000 |
| commit | ef2e9bb65e1f2f3283f93a6a02f8651c99b923de (patch) | |
| tree | f81ac91e5b76f9a4e98d36fed331534bd1c3a265 /app-admin | |
| parent | Fixed dependency bug 2793 (diff) | |
| download | gentoo-2-ef2e9bb65e1f2f3283f93a6a02f8651c99b923de.tar.gz gentoo-2-ef2e9bb65e1f2f3283f93a6a02f8651c99b923de.tar.bz2 gentoo-2-ef2e9bb65e1f2f3283f93a6a02f8651c99b923de.zip | |
More qpkg fixage, see ChangeLog
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/gentoolkit/ChangeLog | 11 | ||||
| -rw-r--r-- | app-admin/gentoolkit/files/scripts/qpkg | 22 |
2 files changed, 20 insertions, 13 deletions
diff --git a/app-admin/gentoolkit/ChangeLog b/app-admin/gentoolkit/ChangeLog index f04d4603b3de..f4801434b3af 100644 --- a/app-admin/gentoolkit/ChangeLog +++ b/app-admin/gentoolkit/ChangeLog @@ -1,11 +1,18 @@ # ChangeLog for app-admin/gentoolkit # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.20 2002/06/05 01:37:53 lostlogic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/ChangeLog,v 1.21 2002/06/05 02:45:30 lostlogic Exp $ *gentoolkit-0.1.11 (04 Jun 2002) + 04 Jun 2002: Brandon Low <lostlogic@gentoo.org> files/scripts/qpkg + + Fixed better, now -c does check for mis-cased md5s, and our time is + a nice compromise between everything. To accomplish this, I used tr + instead of awk to do the case change, and only check IF the first md5 + check fails. + 04 Jun 2002: Brandon Low <lostlogic@gentoo.org> gentoolkit-0.1.11.ebuild - qpkg + files/scripts/qpkg Made qpkg root:wheel 0750 users really shouldn't have more than emerge -s permissions with this kind of stuff. diff --git a/app-admin/gentoolkit/files/scripts/qpkg b/app-admin/gentoolkit/files/scripts/qpkg index 6c96bdb46260..6b6408881e2c 100644 --- a/app-admin/gentoolkit/files/scripts/qpkg +++ b/app-admin/gentoolkit/files/scripts/qpkg @@ -5,8 +5,8 @@ # Copiright (c) Vitaly Kushneriuk <vitaly_kushneriuk@yahoo.com> # This program is distributed under the terms of GPL version 2. # -# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.4 2002/06/05 01:13:36 lostlogic Exp $ -ID='$Id: qpkg,v 1.4 2002/06/05 01:13:36 lostlogic Exp $' +# $Header: /var/cvsroot/gentoo-x86/app-admin/gentoolkit/files/scripts/qpkg,v 1.5 2002/06/05 02:45:33 lostlogic Exp $ +ID='$Id: qpkg,v 1.5 2002/06/05 02:45:33 lostlogic Exp $' VERSION=0.`echo $ID | cut -d\ -f3` PROG=`basename $0` @@ -345,7 +345,7 @@ for p in $ipak $upak -;do [ "$tcheck" ] && _mtime=`date -r $name +%s` [ "$mcheck" ] && md5=${line[2]} - [ "$mcheck" ] && md5=${line[2]} + [ "$mcheck" ] && _md5=`md5sum $name|cut -f1 -d" "` } name=$BR$name$NO @@ -363,14 +363,13 @@ for p in $ipak $upak -;do name="$name $RD!not exist!$NO" fi if [ "$md5" != "$_md5" ]; then - #I was going to put the awking toupper here but it didn't - #save any time... I'm taking it out, kill me later. - #md5=`echo "$md5"| awk '{print toupper($1)}'` - #_md5=`echo "$_md5"|awk '{print toupper($1)}'` - #if [ "$md5" != "$_md5" ]; then - err=1 - name="$name $RD!md5!$NO" - #fi + #If the md5 fails the first time check it with + #everything changed to lowercase :-D + md5=`echo "$md5"|tr A-Z a-z` + if [ "$md5" != "$_md5" ]; then + err=1 + name="$name $RD!md5!$NO" + fi fi if [ "$mtime" != "$_mtime" ]; then err=1 @@ -378,6 +377,7 @@ for p in $ipak $upak -;do fi [ $verb -gt 1 ] && echo -e $name + [[ $verb -eq 1 ]] && [[ $err -eq 1 ]] && echo -e $name fe=$((fe + err)) done |