From: Michael Matz <matz@suse.de>
Date: Sat, 20 Oct 2007 16:43:57 +0000 (+0000)
Subject: Now that I can read content files, let's use that.
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~1218
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ebc7373b5f629267d9f90ac558ef448d45a9ba9;p=platform%2Fupstream%2Flibsolv.git

Now that I can read content files, let's use that.
---

diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh
index 3a7baa8..3b706a5 100755
--- a/tools/repo2solv.sh
+++ b/tools/repo2solv.sh
@@ -53,8 +53,11 @@ if test -d repodata; then
     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 @@ elif test -d suse/setup/descr; then
 	esac
       done
     fi
-  ) | susetags2solv
+  ) | susetags2solv > $filepack
+  cd "$olddir"
+  content2solv < content > $filecont
+  mergesolv $filecont $filepack
+  rm -f $filepack $filecont
 fi