# HG changeset patch # User Christopher Rogers # Date 1304956887 0 # Node ID 1dc5d972d44b8c49f6fd2237bbde4a8fc25130bf # Parent 012b3c074bdc6bc1ff1cb6865ca58d130a686a5d Revert last commit. diff -r 012b3c074bdc -r 1dc5d972d44b tazwok --- a/tazwok Mon May 09 13:09:31 2011 +0000 +++ b/tazwok Mon May 09 16:01:27 2011 +0000 @@ -116,8 +116,8 @@ # /!\ This part needs some changes. # Basically, get these files from the net if they are missing. - dep_db=$PACKAGES_REPOSITORY/wok-depends.txt - wan_db=$PACKAGES_REPOSITORY/wok-wanted.txt + dep_db=$INCOMING_REPOSITORY/wok-depends.txt + wan_db=$INCOMING_REPOSITORY/wok-wanted.txt # Check commons directories, create them if user is root. if test $(id -u) = 0 ; then @@ -1559,10 +1559,10 @@ look_for_dep() { if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ | cut -f 2 else - grep -m1 ^$PACKAGE$'\t' $dep_db | \ + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \ cut -f 2 fi } @@ -1575,19 +1575,19 @@ look_for_all() { if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ | cut -f 2,3 | sed 's/ / /' else - grep -m1 ^$PACKAGE$'\t' $dep_db | \ + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \ cut -f 2,3 | sed 's/ / /' fi } look_for_rdep() { - fgrep ' '$PACKAGE' ' $dep_db | cut -f 1 + fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | cut -f 1 if [ "$undigest" ]; then - for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt | cut -f 1); do + for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt | cut -f 1); do if [ ! -f "WOK$/$rdep/receipt" ]; then echo "$rdep" fi @@ -1597,10 +1597,10 @@ look_for_rbdep() { - fgrep ' '$PACKAGE' ' $dep_db | \ + fgrep ' '$PACKAGE' ' $INCOMING_REPOSITORY/wok-depends.txt | \ cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1 if [ "$undigest" ]; then - for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-depends.txt \ + for rdep in $(fgrep ' '$PACKAGE' ' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-depends.txt \ | cut -f 1,3 | fgrep ' '$PACKAGE' ' | cut -f 1); do if [ ! -f "WOK$/$rdep/receipt" ]; then echo "$rdep" @@ -1613,18 +1613,18 @@ look_for_wanted() { if [ "$undigest" ] && [ ! -f "$WOK/$PACKAGE/receipt" ]; then - grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-wanted.txt | cut -f 2 + grep -m1 ^$PACKAGE$'\t' $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 2 else - grep -m1 ^$PACKAGE$'\t' $wan_db | cut -f 2 + grep -m1 ^$PACKAGE$'\t' $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 2 fi } # Return packages which wants PACKAGE. look_for_rwanted() { - grep $'\t'$PACKAGE$ $wan_db | cut -f 1 + grep $'\t'$PACKAGE$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1 if [ "$undigest" ]; then - for rwanted in $(grep $'\t'$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages/wok-wanted.txt | cut -f 1); do + for rwanted in $(grep $'\t'$PACKAGE$ $SLITAZ_DIR/$SLITAZ_VERSION/packages-incoming/wok-wanted.txt | cut -f 1); do if [ ! -f "$WOK/$rwanted/receipt" ]; then echo "$rwanted" fi