tazwok rev 518
Fixed last commit to not confict branch 4.3.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Tue May 10 07:51:35 2011 +0000 (2011-05-10) |
parents | 3780ddec2497 |
children | 80c33ad3414d 88f755b3b10c |
files | tazwok |
line diff
1.1 --- a/tazwok Tue May 10 07:20:40 2011 +0000 1.2 +++ b/tazwok Tue May 10 07:51:35 2011 +0000 1.3 @@ -1530,9 +1530,9 @@ 1.4 if [ "$status" = start ]; then 1.5 cp -f $tmp/db /tmp/remain-depends.txt 1.6 echo "Can't go further because of dependency loop(s). The remaining packages will be commented in the cookorder and will be unbuilt in case of major updates until the problem is solved." >&2 1.7 - for blocked in $(cut -f 1 $tmp/db); do 1.8 - if [ ! $(grep -l "^$blocked$" $PACKAGES_REPOSITORY/blocked) ]; then 1.9 - echo "$blocked" >> $PACKAGES_REPOSITORY/blocked 1.10 + for remaining in $(cut -f 1 $tmp/db); do 1.11 + if ! grep -q ^$remaining $PACKAGES_REPOSITORY/blocked; then 1.12 + echo "$remaining" >> $PACKAGES_REPOSITORY/blocked 1.13 fi 1.14 done 1.15 break