# HG changeset patch # User Christopher Rogers # Date 1305013895 0 # Node ID 9ea09bdcab4898b0cf4d7f3504ee74c8b6a37342 # Parent 3780ddec249775f5233dc7ecb304936b6f5cf7e6 Fixed last commit to not confict branch 4.3. diff -r 3780ddec2497 -r 9ea09bdcab48 tazwok --- a/tazwok Tue May 10 07:20:40 2011 +0000 +++ b/tazwok Tue May 10 07:51:35 2011 +0000 @@ -1530,9 +1530,9 @@ if [ "$status" = start ]; then cp -f $tmp/db /tmp/remain-depends.txt 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 - for blocked in $(cut -f 1 $tmp/db); do - if [ ! $(grep -l "^$blocked$" $PACKAGES_REPOSITORY/blocked) ]; then - echo "$blocked" >> $PACKAGES_REPOSITORY/blocked + for remaining in $(cut -f 1 $tmp/db); do + if ! grep -q ^$remaining $PACKAGES_REPOSITORY/blocked; then + echo "$remaining" >> $PACKAGES_REPOSITORY/blocked fi done break