Author: matz Date: Sat Oct 20 18:43:57 2007 New Revision: 7584 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7584&view=rev Log: Now that I can read content files, let's use that. Modified: trunk/sat-solver/tools/repo2solv.sh Modified: trunk/sat-solver/tools/repo2solv.sh URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo2solv.sh?rev=7584&r1=7583&r2=7584&view=diff ============================================================================== --- trunk/sat-solver/tools/repo2solv.sh (original) +++ trunk/sat-solver/tools/repo2solv.sh Sat Oct 20 18:43:57 2007 @@ -53,8 +53,11 @@ cat $patchfile fi rm -f $primfile $patchfile -elif test -d suse/setup/descr; then +elif test -d suse/setup/descr && test -s content; then + olddir=`pwd` cd suse/setup/descr || exit 2 + filepack=`mktemp` || exit 3 + filecont=`mktemp` || exit 3 ( # First packages if test -s packages.gz; then @@ -79,5 +82,9 @@ esac done fi - ) | susetags2solv + ) | susetags2solv > $filepack + cd "$olddir" + content2solv < content > $filecont + mergesolv $filecont $filepack + rm -f $filepack $filecont fi -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org