# HG changeset patch # User Pascal Bellard # Date 1215002717 0 # Node ID a9bee846789520ab8ee765dde2b419a34655a89c # Parent 8a5c8aed88c9a070d2e63e6237ac7bbea997f7ba Wipe out get_package_fullname_in_list: does not work diff -r 8a5c8aed88c9 -r a9bee8467895 tazpkg --- a/tazpkg Wed Jul 02 10:54:15 2008 +0000 +++ b/tazpkg Wed Jul 02 12:45:17 2008 +0000 @@ -214,28 +214,13 @@ fi } -# Get a package name in packages.list (whatever the version is). -get_package_fullname_in_list() -{ - local pkg=$1 - local i - while [ "$pkg" != "${pkg%-*}" ]; do - pkg=${pkg%-*} - for i in '-[0-9]' '-.[0-9]' '-'; do - if grep -q ^$pkg$i $2; then - grep ^$pkg$i $2 | head -1 # echo - return - fi - done - done -} - # Check for a package in packages.list. Used by get and get-install to grep # package basename. check_for_package_in_list() { local pkg - pkg=$(get_package_fullname_in_list $PACKAGE $LOCALSTATE/packages.list) + pkg=$(grep "^$PACKAGE-[0-9]" $LOCALSTATE/packages.list | head -1) + [ -n "$pkg" ] || pkg=$(grep "^$PACKAGE-.[\.0-9]" $LOCALSTATE/packages.list | head -1) if [ -n "$pkg" ]; then PACKAGE=$pkg else