summaryrefslogtreecommitdiff
path: root/tools/repo2solv.sh
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2009-03-18 13:29:07 +0100
committerMichael Schroeder <mls@suse.de>2009-03-18 13:29:07 +0100
commit9edc76fe138da755c7392917e3d052b9673e55b3 (patch)
tree7d4035b7b4337474dca8c344407892a890e757b8 /tools/repo2solv.sh
parent6f7d6f2fd07b10ada507d60e81248deccbbcec34 (diff)
downloadlibsolv-9edc76fe138da755c7392917e3d052b9673e55b3.tar.gz
libsolv-9edc76fe138da755c7392917e3d052b9673e55b3.tar.bz2
libsolv-9edc76fe138da755c7392917e3d052b9673e55b3.zip
- kill obsolete and broken patchxml support
Diffstat (limited to 'tools/repo2solv.sh')
-rwxr-xr-xtools/repo2solv.sh23
1 files changed, 2 insertions, 21 deletions
diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh
index 0995d33..82cf382 100755
--- a/tools/repo2solv.sh
+++ b/tools/repo2solv.sh
@@ -189,22 +189,6 @@ if test "$repotype" = rpmmd ; then
$cmd "$i" | updateinfoxml2solv $parser_options > $updateinfofile || exit 4
fi
- patchfile="/nonexist"
- if test -f patches.xml; then
- patchfile=`mktemp` || exit 3
- (
- echo '<patches>'
- for i in patch-*.xml*; do
- case $i in
- *.gz) gzip -dc "$i" ;;
- *.bz2) bzip2 -dc "$i" ;;
- *) cat "$i" ;;
- esac
- done
- echo '</patches>'
- ) | grep -v '\?xml' | patchxml2solv $parser_options > $patchfile || exit 4
- fi
-
# This contains a deltainfo.xml*
cmd=
for i in deltainfo.xml*; do
@@ -240,17 +224,14 @@ if test "$repotype" = rpmmd ; then
if test -s $prodfile; then
m_prodfile=$prodfile
fi
- if test -s $patchfile; then
- m_patchfile=$patchfile
- fi
if test -s $updateinfofile; then
m_updateinfofile=$updateinfofile
fi
if test -s $deltainfofile; then
m_deltainfofile=$deltainfofile
fi
- mergesolv $m_repomdfile $m_suseinfofile $m_primfile $m_prodfile $m_patternfile $m_patchfile $m_updateinfofile $m_deltainfofile
- rm -f $repomdfile $suseinfofile $primfile $patternfile $prodfile $patchfile $updateinfofile $deltainfofile
+ mergesolv $m_repomdfile $m_suseinfofile $m_primfile $m_prodfile $m_patternfile $m_updateinfofile $m_deltainfofile
+ rm -f $repomdfile $suseinfofile $primfile $patternfile $prodfile $updateinfofile $deltainfofile
elif test "$repotype" = susetags ; then
olddir=`pwd`