ref: refs/heads/master commit 921680a84c12a2c8ff38af6845379da439d46e5c Author: Michael Andres Date: Mon Nov 23 16:14:33 2009 +0100 Get (optionally compressed) product.xml from repomd --- tools/repo2solv.sh | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/repo2solv.sh b/tools/repo2solv.sh index 65bfdce..512a6aa 100755 --- a/tools/repo2solv.sh +++ b/tools/repo2solv.sh @@ -116,13 +116,15 @@ if test "$repotype" = rpmmd ; then fi prodfile= - if test -f product.xml; then + prodxml=`repomd_findfile product product.xml` + if test -z "$prodxml" ; then + prodxml=`repomd_findfile products products.xml` + fi + if test -n "$prodxml" -a -s "$prodxml" ; then prodfile=`mktemp` || exit 3 ( echo '<products>' - for i in product*.xml*; do - repomd_decompress $i - done + repomd_decompress "$prodxml" echo '</products>' ) | grep -v '\?xml' | rpmmd2solv $parser_options > $prodfile || exit 4 fi -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org