Author: aschnell Date: Tue Aug 28 10:52:41 2007 New Revision: 6917 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6917&view=rev Log: - also check supplements Modified: trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.rb trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.ref.out trunk/repotools/zypptools/output/yast.rb trunk/repotools/zypptools/output/yum.rb Modified: trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.rb?rev=6917&r1=6916&r2=6917&view=diff ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.rb (original) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.rb Tue Aug 28 10:52:41 2007 @@ -25,6 +25,7 @@ pkg.deps :provides, "perl(Automake::Options) = 0.31" pkg.deps :provides, "xorg-x11-libs:/usr/X11R6/lib/libXt.so.6" pkg.deps :provides, "ksym(zt_dtmf_tone) = 150c20a4" +pkg.deps :supplements, "filesystem(xfs)" packages.push(pkg) Modified: trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.ref.out?rev=6917&r1=6916&r2=6917&view=diff ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.ref.out (original) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/special1.ref.out Tue Aug 28 10:52:41 2007 @@ -9,5 +9,6 @@ Freshens: csb Freshens: modalias(kernel-default:pci:v00008086d00002580sv*sd*bc*sc*i*) Supplements: aspell + Supplements: filesystem(xfs) Supplements: kernel-default Modified: trunk/repotools/zypptools/output/yast.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/yast.rb?rev=6917&r1=6916&r2=6917&view=diff ============================================================================== --- trunk/repotools/zypptools/output/yast.rb (original) +++ trunk/repotools/zypptools/output/yast.rb Tue Aug 28 10:52:41 2007 @@ -83,6 +83,20 @@ out.puts "-Prv:" end + x = pkg.send(:supplements) + if x + out.puts "+Sup:" + x.each do |cap| + # FIXME: it this ok? + if cap.op + out.puts "#{cap.name} #{cap.op} #{cap.version}" + else + out.puts "#{cap.name}" + end + end + out.puts "-Sup:" + end + end out.close() Modified: trunk/repotools/zypptools/output/yum.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/yum.rb?rev=6917&r1=6916&r2=6917&view=diff ============================================================================== --- trunk/repotools/zypptools/output/yum.rb (original) +++ trunk/repotools/zypptools/output/yum.rb Tue Aug 28 10:52:41 2007 @@ -89,7 +89,7 @@ (f.add_element 'rpm:buildhost').text = pkg.buildhost (f.add_element 'rpm:sourcerpm').text = pkg.sourcerpm - [ :requires, :provides, :conflicts ].each do |dept| + [ :requires, :provides, :conflicts, :supplements ].each do |dept| x = pkg.send(dept) if x d = f.add_element 'rpm:' + dept.to_s -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org