May 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10244 - /trunk/sat-solver/tools/tests/CMakeLists.txt
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 18:14:43 2008 New Revision: 10244 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10244&view=rev Log: add updateinfo directory Modified: trunk/sat-solver/tools/tests/CMakeLists.txt Modified: trunk/sat-solver/tools/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/CMakeList… ============================================================================== --- trunk/sat-solver/tools/tests/CMakeLists.txt (original) +++ trunk/sat-solver/tools/tests/CMakeLists.txt Tue May 27 18:14:43 2008 @@ -4,3 +4,4 @@ ENABLE_TESTING() ADD_SUBDIRECTORY(content) +ADD_SUBDIRECTORY(updateinfo) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10243 - /trunk/libzypp/zypp/PoolQuery.h
by jkupec＠svn.opensuse.org 27 May '08

27 May '08

Author: jkupec Date: Tue May 27 17:05:08 2008 New Revision: 10243 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10243&view=rev Log: - comments Modified: trunk/libzypp/zypp/PoolQuery.h Modified: trunk/libzypp/zypp/PoolQuery.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/PoolQuery.h?rev=102… ============================================================================== --- trunk/libzypp/zypp/PoolQuery.h (original) +++ trunk/libzypp/zypp/PoolQuery.h Tue May 27 17:05:08 2008 @@ -45,7 +45,43 @@ * Meta-data query API. Returns solvables of specified kinds from specified * repositories with attributes matching the specified search strings. * - * TODO: details, examples. + * The search strings can be specified via \ref addString() and + * \ref addAttribute() methods. String matching type can be set using the + * setMatch*() methods. Multiple search strings for a particular attribute + * will be combined into a regex (see \ref addString() and + * \ref addAttribute() for more details). + * + * The begin() and end() methods return a PoolQueryIterator returning + * \ref sat::Solvable objects which can easily be turned into \ref Resolvable + * objects. Additionally, thanx to the \ref sat::SolvIterMixin, a Selectable + * and PoolItem iterators are automatically available. + * + * <code> + * PoolQuery q; + * q.addAttribute(sat::SolvAttr::name, "zypp*"); + * q.addKind(ResKind::package); + * q.setMatchGlob(); + * + * for (PoolQuery::Selectable_iterator it = q.selectableBegin(); + * it != q.selectableEnd(); ++it) + * { + * ui::Selectable::constPtr s = *it; + * // ... + * } + * </code> + * + * Performance considerations + * + * Results of simple queries like those using one string and/or one attribute + * and/or one repository are filtered by sat-solver's Dataiterator directly, + * and thus it is fast. + * + * Queries with multiple strings are implemented using regexes. Queries based + * on kinds, multiple repos, and multiple attributes are filtered inside + * the PoolQuery, so these tend to be slower. + * + * \see tests/zypp/PoolQuery_test.cc for more examples + * \see sat::SolvIterMixin */ class PoolQuery : public sat::SolvIterMixin<PoolQuery, detail::PoolQueryIterator> { @@ -93,9 +129,8 @@ //@} /** - * executes the query with the current settings - * results are yielded on the callback passed on - * construction + * Executes the query with the current settings. + * Results are yielded via the \a fnc callback. */ void execute(ProcessResolvable fnc); @@ -105,8 +140,7 @@ * By default, all kinds will be returned. If addKind() is used, * only the specified kinds will be returned (multiple kinds will be ORed). * - * Pass ResTraits<T>::kind to this method, where T is one of the - * \ref Resolvable child classes (e.g. ResTraits<Pattern>::kind). + * Pass ResKind constants to this method, (e.g. ResKind::package). */ void addKind(const ResKind & kind); @@ -129,19 +163,39 @@ INSTALLED_ONLY = 1, UNINSTALLED_ONLY = 2 }; + + /** Return only @System repo packages */ void setInstalledOnly(); + /** Return only packages from repos other than @System. */ void setUninstalledOnly(); + /** Set status filter directly \see StatusFilter */ void setStatusFilterFlags( StatusFilter flags ); //@} /** - * + * Add a global query string. The string added via this method is applied + * to all query attributes as if addAttribute(..., \value) was called + * for all of them. + * + * This method can be used multiple times in which case the query strings + * will be combined (together with strings added via addAttribute()) into + * a regex. Searched attribute value will match this regex if any + * of these strings will match the value. This can be changed by + * (not yet implemented) \ref setRequireAll() method. */ void addString(const std::string & value); /** - * Filter by the \a value of any available solvable attribute. + * Filter by the \a value of the specified \a attr attribute. This can + * be any of the available solvable attributes. + * + * This method can be used multiple times with the same \a attr in which + * case the query strings will be combined (together with strings added + * via addString()) into a regex. Searched attribute value will match + * this regex if any of these strings will match the value. + * This can be changed by (not yet implemented) \ref setRequireAll() + * method. * * \note Solvables of a kind not supporting the specified attribute will * not be returned. @@ -149,6 +203,8 @@ * * \param attr Attribute identfier. Use sat::Solvattr::* constants * \param value What to search for. + * + * \see sat::SolvAttr */ void addAttribute(const sat::SolvAttr & attr, const std::string & value = ""); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10242 - /trunk/dialogsolver/src/solvertree.cpp
by schubi2＠svn.opensuse.org 27 May '08

27 May '08

Author: schubi2 Date: Tue May 27 16:33:55 2008 New Revision: 10242 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10242&view=rev Log: avoid recursion Modified: trunk/dialogsolver/src/solvertree.cpp Modified: trunk/dialogsolver/src/solvertree.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/solvertree.cpp?… ============================================================================== --- trunk/dialogsolver/src/solvertree.cpp (original) +++ trunk/dialogsolver/src/solvertree.cpp Tue May 27 16:33:55 2008 @@ -136,7 +136,8 @@ data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].item=it->item; // we have found a root; collect all trees - buildTree ( data, data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, it->item, id); + if (it->item != item) + buildTree ( data, data->m_TreeDisplay->m_RevGraphView->m_Tree[idStr].targets, it->item, id); } } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10241 - in /trunk/sat-solver/tools/tests/updateinfo: testdata.yaml testing.rb
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 15:38:05 2008 New Revision: 10241 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10241&view=rev Log: ful test coverage for initial example Modified: trunk/sat-solver/tools/tests/updateinfo/testdata.yaml trunk/sat-solver/tools/tests/updateinfo/testing.rb Modified: trunk/sat-solver/tools/tests/updateinfo/testdata.yaml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/testdata.yaml (original) +++ trunk/sat-solver/tools/tests/updateinfo/testdata.yaml Tue May 27 15:38:05 2008 @@ -1,21 +1,38 @@ fedora-imlib: 0: +# <update from="rel-eng(a)fedoraproject.org" status="stable" type="security" version="1.4"> name: patch:FEDORA-2007-4594 evr: 1.4 arch: noarch vendor: rel-eng(a)fedoraproject.org # - not parsed - "patch:status": stable + "solvable:patchcategory": security "solvable:summary": imlib-1.9.15-6.fc8 -# <release>Fedora 8</release> -# <issued date="2007-12-28 16:42:30"/> -# <references> -# <reference href="https://bugzilla.redhat.com/show_bug.cgi?id=426091" id="426091" title="CVE-2007-3568 imlib: infinite loop DoS using crafted BMP image" type="bugzilla"/> -# </references> -# <description>This update includes a fix for a denial-of-service issue (CVE-2007-3568) whereby an attacker who could get an imlib-using user to view a specially-crafted BMP image could cause the user's CPU to go into an infinite loop.</description> -# <pkglist> -# <collection short="F8"> -# <name>Fedora 8</name> -# <package arch="ppc64" name="imlib-debuginfo" release="6.fc8" src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-de…" version="1.9.15"> -# <filename>imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm</filename> -# <reboot_suggested>True</reboot_suggested> + +# - not parsed - <release>Fedora 8</release> + + "solvable:buildtime": 2007-12-28 16:42:30 + +# <reference href="https://bugzilla.redhat.com/show_bug.cgi?id=426091" id="426091" title="" type="bugzilla"/> + "update:reference:href": + 0: https://bugzilla.redhat.com/show_bug.cgi?id=426091 + "update:reference:id": + 0: 426091 + "update:reference:title": + 0: "CVE-2007-3568 imlib: infinite loop DoS using crafted BMP image" + "update:reference:type": + 0: bugzilla + "solvable:description": This update includes a fix for a denial-of-service issue (CVE-2007-3568) whereby an attacker who could get an imlib-using user to view a specially-crafted BMP image could cause the user's CPU to go into an infinite loop. + +# <package arch="ppc64" name="imlib-debuginfo" release="6.fc8" +# src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-de…" version="1.9.15"> + "update:collection:name": + 0: imlib-debuginfo + "update:collection:evr": + 0: 1.9.15-6.fc8 + "update:collection:arch": + 0: ppc64 + "update:collection:filename": + 0: imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm + "update:reboot": True Modified: trunk/sat-solver/tools/tests/updateinfo/testing.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/testing.rb (original) +++ trunk/sat-solver/tools/tests/updateinfo/testing.rb Tue May 27 15:38:05 2008 @@ -24,33 +24,37 @@ class ContentTest < Test::Unit::TestCase def setup - - @srcpath = Pathname.new SRCPATH - assert @srcpath.directory? - @binpath = Pathname.new BINPATH - assert @binpath.directory? - - $:.unshift( @binpath + "bindings/ruby" ) - require 'satsolver' - - @tag = TAG - @tool = @binpath + "tools/updateinfoxml2solv" - assert @tool.executable? - - @outpath = @binpath + "tools/tests/updateinfo" - assert @outpath.directory? - - yamlpath = @srcpath + DATA - @logf = File.open("/tmp/output", "w") @logf.puts "Testing started at #{Time.now}\n--" - @logf.puts "@binpath #{@binpath}" - @logf.puts "@tag #{@tag}" - @logf.puts "@tool #{@tool}" - @logf.puts "@outpath #{@outpath}" - @logf.puts "yamlpath #{yamlpath}" - - @testdata = YAML.load( File.open( yamlpath ) ) + begin + @srcpath = Pathname.new SRCPATH + assert @srcpath.directory? + @binpath = Pathname.new BINPATH + assert @binpath.directory? + + $:.unshift( @binpath + "bindings/ruby" ) + require 'satsolver' + + @tag = TAG + @tool = @binpath + "tools/updateinfoxml2solv" + assert @tool.executable? + + @outpath = @binpath + "tools/tests/updateinfo" + assert @outpath.directory? + + yamlpath = @srcpath + DATA + + @logf.puts "@binpath #{@binpath}" + @logf.puts "@tag #{@tag}" + @logf.puts "@tool #{@tool}" + @logf.puts "@outpath #{@outpath}" + @logf.puts "yamlpath #{yamlpath}" + + @testdata = YAML.load( File.open( yamlpath ) ) + rescue Exception => e + @logf.puts "**ERR #{e}" + raise e + end end def teardown @logf.puts "--\nTesting ended at #{Time.now}" if @logf @@ -104,7 +108,7 @@ end case v - when String, Float + when String, Float, TrueClass, FalseClass assert_equal v.to_s, p.to_s when Hash if (p.class == Satsolver::Dependency) @@ -150,8 +154,15 @@ p.each { |dep| raise "Not a dependency: #{v}" unless expected.include?( dep ) } + elsif (p.class == Array) + expected = [] + v.each { |k,v| expected << v.to_s } + assert_equal p.size, expected.size + p.each { |prop| + raise "Not expected in property array: #{v}" unless expected.include?( prop ) + } else - raise "Don't know what to do with Hash for property/attribute #{k}" + raise "Don't know what to do with Hash for property/attribute #{k} of class #{p.class}" end else raise "Can't handle value class #{v.class} of YAML key #{k}" -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10240 - in /trunk/sat-solver/tools/tests/updateinfo: CMakeLists.txt testdata.yaml testing.rb updateinfo.fedora-imlib
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 15:16:40 2008 New Revision: 10240 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10240&view=rev Log: add testcase for updateinfoxml2solv Added: trunk/sat-solver/tools/tests/updateinfo/CMakeLists.txt trunk/sat-solver/tools/tests/updateinfo/testdata.yaml trunk/sat-solver/tools/tests/updateinfo/testing.rb trunk/sat-solver/tools/tests/updateinfo/updateinfo.fedora-imlib Added: trunk/sat-solver/tools/tests/updateinfo/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/CMakeLists.txt (added) +++ trunk/sat-solver/tools/tests/updateinfo/CMakeLists.txt Tue May 27 15:16:40 2008 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for sat-solver/tools/tests/updateinfo +# + +ENABLE_TESTING() + +ADD_TEST(updateinfo1 ruby ${CMAKE_CURRENT_SOURCE_DIR}/testing.rb ${CMAKE_BINARY_DIR} fedora-imlib) Added: trunk/sat-solver/tools/tests/updateinfo/testdata.yaml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/testdata.yaml (added) +++ trunk/sat-solver/tools/tests/updateinfo/testdata.yaml Tue May 27 15:16:40 2008 @@ -0,0 +1,21 @@ +fedora-imlib: + 0: + name: patch:FEDORA-2007-4594 + evr: 1.4 + arch: noarch + vendor: rel-eng(a)fedoraproject.org +# - not parsed - "patch:status": stable + "solvable:patchcategory": security + "solvable:summary": imlib-1.9.15-6.fc8 +# <release>Fedora 8</release> +# <issued date="2007-12-28 16:42:30"/> +# <references> +# <reference href="https://bugzilla.redhat.com/show_bug.cgi?id=426091" id="426091" title="CVE-2007-3568 imlib: infinite loop DoS using crafted BMP image" type="bugzilla"/> +# </references> +# <description>This update includes a fix for a denial-of-service issue (CVE-2007-3568) whereby an attacker who could get an imlib-using user to view a specially-crafted BMP image could cause the user's CPU to go into an infinite loop.</description> +# <pkglist> +# <collection short="F8"> +# <name>Fedora 8</name> +# <package arch="ppc64" name="imlib-debuginfo" release="6.fc8" src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-de…" version="1.9.15"> +# <filename>imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm</filename> +# <reboot_suggested>True</reboot_suggested> Added: trunk/sat-solver/tools/tests/updateinfo/testing.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/testing.rb (added) +++ trunk/sat-solver/tools/tests/updateinfo/testing.rb Tue May 27 15:16:40 2008 @@ -0,0 +1,167 @@ +#!/usr/bin/env ruby + +require 'test/unit' +require 'pathname' +require 'yaml' + + +SRCPATH = Pathname( File.dirname( __FILE__ ) ) +BINPATH = ARGV[0] +TAG = ARGV[1] +DATA = "testdata.yaml" + +if BINPATH.nil? || BINPATH == "--help" + STDERR.puts "Usage: content_test [<bindir> [<tag>]]" + STDERR.puts "\t<bindir>: cmake binary dir (toplevel)" + STDERR.puts "\t<tag>: optional tag of content file, content.<tag>" + STDERR.puts "\t\tif <tag> is omitted, process all content tags listed in 'testdata.yaml'" + exit 0 +end + +# +# Called with <bindir> <tag> +# + +class ContentTest < Test::Unit::TestCase + def setup + + @srcpath = Pathname.new SRCPATH + assert @srcpath.directory? + @binpath = Pathname.new BINPATH + assert @binpath.directory? + + $:.unshift( @binpath + "bindings/ruby" ) + require 'satsolver' + + @tag = TAG + @tool = @binpath + "tools/updateinfoxml2solv" + assert @tool.executable? + + @outpath = @binpath + "tools/tests/updateinfo" + assert @outpath.directory? + + yamlpath = @srcpath + DATA + + @logf = File.open("/tmp/output", "w") + @logf.puts "Testing started at #{Time.now}\n--" + @logf.puts "@binpath #{@binpath}" + @logf.puts "@tag #{@tag}" + @logf.puts "@tool #{@tool}" + @logf.puts "@outpath #{@outpath}" + @logf.puts "yamlpath #{yamlpath}" + + @testdata = YAML.load( File.open( yamlpath ) ) + end + def teardown + @logf.puts "--\nTesting ended at #{Time.now}" if @logf + end + # + # test content.<tag> + # 1. convert it to .solv + # 2. load .solv + # 3. assert properties as defined in @testdata YAML hash + # + + def test_tag + begin + + # convert content file to .solv + + inname = @srcpath + "updateinfo.#{@tag}" + solvname = "#{(a)tag}.solv" + outname = @outpath + solvname + cmd = "#{@tool} < #{inname} > #{outname}" + @logf.puts "CMD #{cmd}" + system cmd + assert_equal 0, $? + + testdata = @testdata[@tag] + + # create the Pool, load the .solv file + + pool = Satsolver::Pool.new + repo = pool.add_solv outname.to_s + assert_equal testdata.size, repo.size + + # get the solvable + + testdata_index = 0 + + repo.each { |solvable| + + # loop over YAML hash entries and compare to solvable properties + + testdata[testdata_index].each { |k,v| + + s = k.to_sym # symbol + # retrieve property + if solvable.respond_to?( s ) + p = solvable.send(s) + elsif solvable.attr?( s ) + p = solvable[s] + else + raise "Unknown property/attribute #{k}" + end + + case v + when String, Float + assert_equal v.to_s, p.to_s + when Hash + if (p.class == Satsolver::Dependency) + # + # check dependency relations + # + expected = [] + v.each { |k,v| + # + # Convert "<name> <op> <evr>" string to Satsolver::Relation + # + nov = v.split " " # split to name,op,version + if nov.size == 1 + expected << Satsolver::Relation.new( pool, v ) + elsif nov.size == 3 + op = Satsolver::REL_NONE + case nov[1] + when "=", "==" + op = Satsolver::REL_EQ + when "<" + op = Satsolver::REL_LT + when ">" + op = Satsolver::REL_GT + when "<=" + op = Satsolver::REL_LE + when ">=" + op = Satsolver::REL_GE + when "<>", "!=" + op = Satsolver::REL_NE + else + raise "Not a parseable relation operator '#{nov[1]}'" + end + expected << Satsolver::Relation.new( pool, nov[0], op, nov[2] ) + else + raise "Not a parseable relation '#{v}'" + end + } + + # check equal size of solvable dependencies with expected dependencies + assert_equal p.size, expected.size + + # now loop over the dependencies and check them one-by-one + p.each { |dep| + raise "Not a dependency: #{v}" unless expected.include?( dep ) + } + else + raise "Don't know what to do with Hash for property/attribute #{k}" + end + else + raise "Can't handle value class #{v.class} of YAML key #{k}" + end + } # testdata.each + testdata_index += 1 + } # repo.each + rescue Exception => e + @logf.puts "**ERR #{e}" + raise e + end + end +end Added: trunk/sat-solver/tools/tests/updateinfo/updateinfo.fedora-imlib URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/updateinf… ============================================================================== --- trunk/sat-solver/tools/tests/updateinfo/updateinfo.fedora-imlib (added) +++ trunk/sat-solver/tools/tests/updateinfo/updateinfo.fedora-imlib Tue May 27 15:16:40 2008 @@ -0,0 +1,22 @@ +<updates> + <update from="rel-eng(a)fedoraproject.org" status="stable" type="security" version="1.4"> + <id>FEDORA-2007-4594</id> + <title>imlib-1.9.15-6.fc8</title> + <release>Fedora 8</release> + <issued date="2007-12-28 16:42:30"/> + <references> + <reference href="https://bugzilla.redhat.com/show_bug.cgi?id=426091" id="426091" title="CVE-2007-3568 imlib: infinite loop DoS using crafted BMP image" type="bugzilla"/> + </references> + <description>This update includes a fix for a denial-of-service issue (CVE-2007-3568) whereby an attacker who could get an imlib-using user to view a specially-crafted BMP image could cause the user's CPU to go into an infinite loop.</description> + <pkglist> + <collection short="F8"> + <name>Fedora 8</name> + <package arch="ppc64" name="imlib-debuginfo" release="6.fc8" src="http://download.fedoraproject.org/pub/fedora/linux/updates/8/ppc64/imlib-de…" version="1.9.15"> + <filename>imlib-debuginfo-1.9.15-6.fc8.ppc64.rpm</filename> + <reboot_suggested>True</reboot_suggested> + </package> + </collection> + </pkglist> + </update> +</updates> + -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10239 - in /trunk/sat-solver/tools: ./ tests/ tests/content/ tests/deltainfo/ tests/patchxml/ tests/rpmmd/ tests/susetags/ tests/updateinfo/
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 14:29:34 2008 New Revision: 10239 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10239&view=rev Log: - prepare for tools testing - implement 'content' parser test Added: trunk/sat-solver/tools/tests/ trunk/sat-solver/tools/tests/CMakeLists.txt trunk/sat-solver/tools/tests/content/ trunk/sat-solver/tools/tests/content/CMakeLists.txt trunk/sat-solver/tools/tests/content/content.os11-beta3-dvd-x86_64 trunk/sat-solver/tools/tests/content/testdata.yaml trunk/sat-solver/tools/tests/content/testing.rb trunk/sat-solver/tools/tests/deltainfo/ trunk/sat-solver/tools/tests/patchxml/ trunk/sat-solver/tools/tests/rpmmd/ trunk/sat-solver/tools/tests/susetags/ trunk/sat-solver/tools/tests/updateinfo/ Modified: trunk/sat-solver/tools/CMakeLists.txt Modified: trunk/sat-solver/tools/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?… ============================================================================== --- trunk/sat-solver/tools/CMakeLists.txt (original) +++ trunk/sat-solver/tools/CMakeLists.txt Tue May 27 14:29:34 2008 @@ -1,3 +1,11 @@ +# +# CMakeLists.txt for sat-solver/tools +# + +ENABLE_TESTING() + +ADD_SUBDIRECTORY(tests) + SET(rpmdb2solv_REPOS rpmdb2solv.c repo_rpmdb.h Added: trunk/sat-solver/tools/tests/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/CMakeList… ============================================================================== --- trunk/sat-solver/tools/tests/CMakeLists.txt (added) +++ trunk/sat-solver/tools/tests/CMakeLists.txt Tue May 27 14:29:34 2008 @@ -0,0 +1,6 @@ +# +# CMakeLists.txt for sat-solver/tools/tests +# + +ENABLE_TESTING() +ADD_SUBDIRECTORY(content) Added: trunk/sat-solver/tools/tests/content/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/content/C… ============================================================================== --- trunk/sat-solver/tools/tests/content/CMakeLists.txt (added) +++ trunk/sat-solver/tools/tests/content/CMakeLists.txt Tue May 27 14:29:34 2008 @@ -0,0 +1,7 @@ +# +# CMakeLists.txt for sat-solver/tools/tests/content +# + +ENABLE_TESTING() + +ADD_TEST(content1 ruby ${CMAKE_CURRENT_SOURCE_DIR}/testing.rb ${CMAKE_BINARY_DIR} os11-beta3-dvd-x86_64) Added: trunk/sat-solver/tools/tests/content/content.os11-beta3-dvd-x86_64 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/content/c… ============================================================================== --- trunk/sat-solver/tools/tests/content/content.os11-beta3-dvd-x86_64 (added) +++ trunk/sat-solver/tools/tests/content/content.os11-beta3-dvd-x86_64 Tue May 27 14:29:34 2008 @@ -0,0 +1,122 @@ +PRODUCT openSUSE-DVD +VERSION 11.0 +DISTPRODUCT openSUSE-DVD +DISTVERSION 11.0-Beta3 +TYPE base +VENDOR SUSE LINUX Products GmbH, Nuernberg, Germany +RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/11.0/release-notes.rpm +ARCH.x86_64 x86_64 i686 i586 i486 i386 noarch +DEFAULTBASE x86_64 +REQUIRES openSUSE-release = 11.0 pattern:basesystem +PROVIDES product:openSUSE = 11.0 +OBSOLETES product:SUSE_LINUX product:openSUSE < 11.0 package:openSUSE < 11.0 +LINGUAS cs da de en en_GB en_US es fi fr hu it ja nb nl pl pt pt_BR ru sv zh zh_CN zh_TW +SHORTLABEL oS 11.0 +LABEL openSUSE 11.0 +LABEL.de openSUSE 11.0 +DESCRDIR suse/setup/descr +DATADIR suse +FLAGS update +LANGUAGE en_US +META SHA1 d0254e8cc77eb4567f912fe4e70895b6ab5e1ad8 EXTRA_PROV +META SHA1 b640c8dab9b0ff8fdd3a70e71db461603488ee5f common.war +META SHA1 ddde123534a63751832ae36dd85f02fde92c9283 dvd-11.0-99.x86_64.pat.gz +META SHA1 0c3cd7f7b53fa76780f7b93d04f67d547cc2eecf non_oss-11.0-99.x86_64.pat.gz +META SHA1 c2c7062980a83cbfc20234c6bd17ecec0f8e1240 packages.DU.gz +META SHA1 76bd2b5ff42e148786d4c25208ffbed1c8c1f39a packages.FL.gz +META SHA1 b8c5dca3b2fba74345c98f6153a2cc5aac269ed1 packages.cs.gz +META SHA1 40dd3687fa67871a4201ee459704f5ec6944308e packages.de.gz +META SHA1 90d090e3a3adca85560f4bb8fb2d346c3ed01b34 packages.en.gz +META SHA1 07af92b6b0a3ce2d073d1e60cdfc05b1853d7df5 packages.es.gz +META SHA1 179a94cdcfdcf627299086b3951ee8890105566e packages.fr.gz +META SHA1 7baafa149831142709108efb88835f941edfa749 packages.gz +META SHA1 be5b6493d2c0584ecdd02a4aa83530fe65fdb8f6 packages.hu.gz +META SHA1 b8c5dca3b2fba74345c98f6153a2cc5aac269ed1 packages.sk.gz +META SHA1 25965ec6d48ac1ec12cce157201528f688b9c927 patterns +HASH SHA1 aba7b03bd17c2d1034ce45453da03a3a16bd1fdb license.tar.gz +HASH SHA1 63b65fc7b64818ca0994abb8e3ae0b66cf2de7ae control.xml +HASH SHA1 b640c8dab9b0ff8fdd3a70e71db461603488ee5f media.1/info.txt +HASH SHA1 5d75fc7c618c2baad6c99a346c6fefb672a77286 boot/x86_64/root +HASH SHA1 521d31dfdb4b45648b03888299817c1466917a53 boot/x86_64/rescue +HASH SHA1 abc120bc340e0347b70d80666cdeb98b2194142d boot/x86_64/config +HASH SHA1 ccb361a11b446462f5376c46376f710cdad0d1a5 boot/x86_64/common +HASH SHA1 8e69ff8d0609fc8b5ca5146bc7eb61be472b36cd boot/x86_64/loader/linux +HASH SHA1 ad38e2060ed6d47f3d4e222a28ef1fdee7976921 boot/x86_64/loader/initrd +HASH SHA1 e566e1305fc26cdc7dc912eb1229d4a860ef76ad boot/x86_64/loader/08000600.spl +HASH SHA1 6b48af039aac05591e4ce0f5595a1bab28949d71 boot/x86_64/loader/10240768.spl +HASH SHA1 0cbd307c441342ad5c39611dfb0a16112a79a34a boot/x86_64/loader/12801024.spl +HASH SHA1 7cf41e929272a68a7b9967bdfa412b976b7a2e05 boot/x86_64/loader/14001050.spl +HASH SHA1 049cab31d1363621169e21ce59f1b51b9ba665dd boot/x86_64/loader/16001200.spl +HASH SHA1 c79c8d6110df48b4345304d7f5277dd1bc593e50 images/base-meta-x86_64.tar.lzma +HASH SHA1 b81b9ccc82812322c80e2a29e678ae4b32a1e0fd images/base-x86_64.tar.lzma +HASH SHA1 dc6ad0016352cb39f2f30b951dcaf2891db45d05 images/common-base-x86_64.tar.lzma +HASH SHA1 4353efab1838740a8a0ab85cab37ae4db36b6a69 images/common-desktop-x86_64.tar.lzma +HASH SHA1 aef039ce91be8817515080911e3f52b5a3937c86 images/common-xorg-x86_64.tar.lzma +HASH SHA1 2782497cd12572b55085d4a815cd37c0c1df5270 images/details-x86_64.xml +HASH SHA1 8332b2a72e0079baa9b4f7c933c45ec145899705 images/gnome-meta-x86_64.tar.lzma +HASH SHA1 3437f51b1f284c45218fb6d2ed1bdc49c6aa5795 images/gnome-x86_64.tar.lzma +HASH SHA1 d1e9a38629e353d1f0136ded670cf28213d47e6f images/images.xml +HASH SHA1 d926cf6db50ae36ad844094169d1e286cc140ff0 images/kde-meta-x86_64.tar.lzma +HASH SHA1 aa4e2b2e31f25dbf4ab685e632a942e7fc3aa817 images/kde-x86_64.tar.lzma +HASH SHA1 e966efd9224c625ce8ad79791974461417708a55 images/x11-meta-x86_64.tar.lzma +HASH SHA1 1f452bff4d60884ce006ac2917138adc99457294 images/x11-x86_64.tar.lzma +HASH SHA1 1486e87e7aa085336e09911c0620b8260d8b8296 boot/x86_64/FZSongTi.rpm +HASH SHA1 61fba487c113e49cfe50ef016fb5dc5905055152 boot/x86_64/IPAGothic.rpm +HASH SHA1 e29e9e548ed243b26895bac269738ea2ff29ebae boot/x86_64/cracklib-dict-full.rpm +HASH SHA1 3a559eb80c9b08d88fdbf65d6cfe0408e1f2d294 boot/x86_64/unfonts.rpm +HASH SHA1 bfdb4c4df99f80d017c9e06eeb469e5c14c32d37 boot/x86_64/yast2-trans-af.rpm +HASH SHA1 af985031287eef715841c3ef85a6aa44545515a6 boot/x86_64/yast2-trans-ar.rpm +HASH SHA1 bf1ced528810c952eedafb56b47122980e058659 boot/x86_64/yast2-trans-bg.rpm +HASH SHA1 3d9977ab1c22e0573d3f1575dcb02e3f127fd9e3 boot/x86_64/yast2-trans-bn.rpm +HASH SHA1 4e97af10737e7546138425892db29ab4d397ae1c boot/x86_64/yast2-trans-bs.rpm +HASH SHA1 fcf471debf0bbc2ea1a513384f669db2da408a9a boot/x86_64/yast2-trans-ca.rpm +HASH SHA1 f8f87dbf60e2ca2da9da228c68496c27a2ea699c boot/x86_64/yast2-trans-cs.rpm +HASH SHA1 6aa47825b246c8b17c4f4aeb6b1375c3ada59bab boot/x86_64/yast2-trans-cy.rpm +HASH SHA1 b15954ffbf03048b0e28d1a7a5ba140e6da28a22 boot/x86_64/yast2-trans-da.rpm +HASH SHA1 539ed3190293c37e604e6e7675fa5f22e79996ad boot/x86_64/yast2-trans-de.rpm +HASH SHA1 d7a413cf3b3b708b001e41c65c3097cfe1d16921 boot/x86_64/yast2-trans-el.rpm +HASH SHA1 bce6ee8790fe24836e9efe36f4ecd36190eeab91 boot/x86_64/yast2-trans-en_GB.rpm +HASH SHA1 b0e3814f48dd4c8ef8019ccbffe6d9e65994ef9b boot/x86_64/yast2-trans-en_US.rpm +HASH SHA1 6a4e2a89bca6bab960d8c9b7633484d9b335d560 boot/x86_64/yast2-trans-es.rpm +HASH SHA1 352d5c107dcab9ce54a569f7730f129e0725366f boot/x86_64/yast2-trans-et.rpm +HASH SHA1 d5aa8a217fdc0b7ea96d37af75df5a73a4fb03b9 boot/x86_64/yast2-trans-fi.rpm +HASH SHA1 29fa095a75bff6b96474796150790808cf67a61c boot/x86_64/yast2-trans-fr.rpm +HASH SHA1 d915e8e2ee01d85f5ca60b5df756831cd062ce93 boot/x86_64/yast2-trans-gl.rpm +HASH SHA1 191f296d955c3447ec6b4165136261962daaf249 boot/x86_64/yast2-trans-gu.rpm +HASH SHA1 755ab0209e4a298b48b8dec02a31bfe884f8e092 boot/x86_64/yast2-trans-hi.rpm +HASH SHA1 d481bec7432c8477636fff7d278fa9c1ffc39ace boot/x86_64/yast2-trans-hr.rpm +HASH SHA1 676df7285677fdd55c4c42bb9bd9f8e1dc80a712 boot/x86_64/yast2-trans-hu.rpm +HASH SHA1 8c6c37ea0d3f22b42bde105e8f51542c5cf52031 boot/x86_64/yast2-trans-it.rpm +HASH SHA1 b58943ed8ea9412599b4fbb6e228fd8dc40b7e7b boot/x86_64/yast2-trans-ja.rpm +HASH SHA1 a1640eab3e96cacad58271f6d4319329ce087220 boot/x86_64/yast2-trans-km.rpm +HASH SHA1 0822d1d76f8bc693ba9864d418e848d7b7aa5f62 boot/x86_64/yast2-trans-ko.rpm +HASH SHA1 8d8894552dbce286897cd630b620272c20dd8fff boot/x86_64/yast2-trans-lt.rpm +HASH SHA1 2c1f7a753dcd23e422538113cf762f0d1d7e46a2 boot/x86_64/yast2-trans-mk.rpm +HASH SHA1 922b68a3f5be0d9e94fb52f98aad963cec3d87e0 boot/x86_64/yast2-trans-mr.rpm +HASH SHA1 621dd87833a705e206564c2b6e290f3aab763bc9 boot/x86_64/yast2-trans-nb.rpm +HASH SHA1 821b54fd994fec3a1f7d1e16d003282990a81fac boot/x86_64/yast2-trans-nl.rpm +HASH SHA1 a49dfbca412c8b68e71632257d92613bc372a5c9 boot/x86_64/yast2-trans-pa.rpm +HASH SHA1 c8cfb2fa54f6f39de5b6cf9ea207ff75cc0768e8 boot/x86_64/yast2-trans-pl.rpm +HASH SHA1 9d8b623a71deb49848c3a70e58eaaec9d3ce788e boot/x86_64/yast2-trans-pt.rpm +HASH SHA1 c00c3c63667116521f7d7a51154f9580eafb8f3c boot/x86_64/yast2-trans-pt_BR.rpm +HASH SHA1 8ff8f8987f02c09fb63606f5872c8886134ed62e boot/x86_64/yast2-trans-ro.rpm +HASH SHA1 8578a429c07ec16037e485764048ce649bae3472 boot/x86_64/yast2-trans-ru.rpm +HASH SHA1 f3b848b3bcfa93db9434ff5c4b121ba8a27a2e02 boot/x86_64/yast2-trans-sk.rpm +HASH SHA1 67aeff2f3576d4ffded286951f18971d83244144 boot/x86_64/yast2-trans-sl.rpm +HASH SHA1 7af4d3d692e3f938993c5a4aba66e243be84e800 boot/x86_64/yast2-trans-sr.rpm +HASH SHA1 28061e0c22b1dc1d2983702494aa2e22eed64da0 boot/x86_64/yast2-trans-sv.rpm +HASH SHA1 0e5dd5cf611b8bb663720c045dc1f77eac29f831 boot/x86_64/yast2-trans-ta.rpm +HASH SHA1 60f8d4f8b341b0cb621d3f77caf7b2dc245cd6a1 boot/x86_64/yast2-trans-tr.rpm +HASH SHA1 953183ae4298e3813cc0dce3ac03c5b3111b9f1d boot/x86_64/yast2-trans-uk.rpm +HASH SHA1 728b7d64df166010d28c16a613ed6c4f4042dca4 boot/x86_64/yast2-trans-vi.rpm +HASH SHA1 1cdc66046724cd6e9e6418cca5a91dbdecbabc85 boot/x86_64/yast2-trans-wa.rpm +HASH SHA1 fbe2188e1e29b52c2608d6970d2252b08a0096e6 boot/x86_64/yast2-trans-xh.rpm +HASH SHA1 d589f5d039f8a0d5344b93d2b4f58b3dbac21017 boot/x86_64/yast2-trans-zh_CN.rpm +HASH SHA1 2bc0a3aefd90f12f0850eac735809a561726f6f6 boot/x86_64/yast2-trans-zh_TW.rpm +HASH SHA1 c0b4ce625f0005f177e23668de4b28b29ca9d853 boot/x86_64/yast2-trans-zu.rpm +KEY SHA1 17162a96933229a9771ee10c0976bdc047a2f53d gpg-pubkey-0dfb3188-41ed929b.asc +KEY SHA1 442682eb40d6a6af22c432f78a9065ddf606d566 gpg-pubkey-307e3d54-44201d5d.asc +KEY SHA1 47f6492d127ae9f6aac353a2dd23752fc0ed4f8d gpg-pubkey-3d25d3d9-36e12d04.asc +KEY SHA1 474e6a2c95eb0325a5b42ef268ef67917b5e4fab gpg-pubkey-7e2e3b05-44748aba.asc +KEY SHA1 06ff5171362496c0db84beeccd29967f580350b2 gpg-pubkey-9c800aca-481f343a.asc +KEY SHA1 04544096c5c3b0ed7b01a83d79e048307c2af919 gpg-pubkey-a1912208-446a0899.asc Added: trunk/sat-solver/tools/tests/content/testdata.yaml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/content/t… ============================================================================== --- trunk/sat-solver/tools/tests/content/testdata.yaml (added) +++ trunk/sat-solver/tools/tests/content/testdata.yaml Tue May 27 14:29:34 2008 @@ -0,0 +1,51 @@ +os11-beta3-dvd-x86_64: + name: product:openSUSE-DVD + evr: 11.0 + arch: noarch + vendor: SUSE LINUX Products GmbH, Nuernberg, Germany + provides: + 0: product:openSUSE-DVD = 11.0 # self provides + 1: product:openSUSE = 11.0 + requires: + 0: pattern:basesystem + 1: openSUSE-release = 11.0 + obsoletes: + 0: product:SUSE_LINUX + 1: product:openSUSE < 11.0 + 2: openSUSE < 11.0 + "product:distproduct": openSUSE-DVD + "product:distversion": 11.0-Beta3 + "product:type": base + "product:relnotesurl": http://www.suse.com/relnotes/i386/openSUSE/11.0/release-notes.rpm +# - not parsed - arch.x86_64: x86_64 i686 i586 i486 i386 noarch +# - not parsed - defaultbase: x86_64 +# - not parsed - linguas: +# 0: cs +# 1: da +# 2: de +# 3: en +# 4: en_GB +# 5: en_US +# 6: es +# 7: fi +# 8: fr +# 9: hu +# 10: it +# 11: ja +# 12: nb +# 13: nl +# 14: pl +# 15: pt +# 16: pt_BR +# 17: ru +# 18: sv +# 19: zh +# 20: zh_CN +# 21: zh_TW + "product:shortlabel": oS 11.0 + "solvable:summary": openSUSE 11.0 # aka 'label' + "solvable:summary:de": openSUSE 11.0 # aka 'label.de' +# - not product related - descrdir: suse/setup/descr +# - not product related - datadir: suse + "product:flags": update +# - not parsed - language: en_US Added: trunk/sat-solver/tools/tests/content/testing.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tests/content/t… ============================================================================== --- trunk/sat-solver/tools/tests/content/testing.rb (added) +++ trunk/sat-solver/tools/tests/content/testing.rb Tue May 27 14:29:34 2008 @@ -0,0 +1,160 @@ +#!/usr/bin/env ruby + +require 'test/unit' +require 'pathname' +require 'yaml' + + +SRCPATH = Pathname( File.dirname( __FILE__ ) ) +BINPATH = ARGV[0] +TAG = ARGV[1] +DATA = "testdata.yaml" + +if BINPATH.nil? || BINPATH == "--help" + STDERR.puts "Usage: content_test [<bindir> [<tag>]]" + STDERR.puts "\t<bindir>: cmake binary dir (toplevel)" + STDERR.puts "\t<tag>: optional tag of content file, content.<tag>" + STDERR.puts "\t\tif <tag> is omitted, process all content tags listed in 'testdata.yaml'" + exit 0 +end + +# +# Called with <bindir> <tag> +# + +class ContentTest < Test::Unit::TestCase + def setup + + @srcpath = Pathname.new SRCPATH + assert @srcpath.directory? + @binpath = Pathname.new BINPATH + assert @binpath.directory? + + $:.unshift( @binpath + "bindings/ruby" ) + require 'satsolver' + + @tag = TAG + @tool = @binpath + "tools/susetags2solv" + assert @tool.executable? + + @outpath = @binpath + "tools/tests/content" + assert @outpath.directory? + + yamlpath = @srcpath + DATA + + @logf = File.open("/tmp/output", "w") + @logf.puts "Testing started at #{Time.now}\n--" + @logf.puts "@binpath #{@binpath}" + @logf.puts "@tag #{@tag}" + @logf.puts "@tool #{@tool}" + @logf.puts "@outpath #{@outpath}" + @logf.puts "yamlpath #{yamlpath}" + + @testdata = YAML.load( File.open( yamlpath ) ) + end + def teardown + @logf.puts "--\nTesting ended at #{Time.now}" if @logf + end + # + # test content.<tag> + # 1. convert it to .solv + # 2. load .solv + # 3. assert properties as defined in @testdata YAML hash + # + + def test_tag + begin + + # convert content file to .solv + + inname = @srcpath + "content.#{@tag}" + solvname = "#{(a)tag}.solv" + outname = @outpath + solvname + cmd = "#{@tool} -c #{inname} < /dev/null > #{outname}" + system cmd + assert_equal 0, $? + + # create the Pool, load the .solv file + + pool = Satsolver::Pool.new + repo = pool.add_solv outname.to_s + assert_equal 1, repo.size + + # get the solvable + + product = repo[0] + + # loop over YAML hash entries and compare to solvable properties + + @testdata[@tag].each { |k,v| + + s = k.to_sym # symbol + # retrieve property + if product.respond_to?( s ) + p = product.send(s) + elsif product.attr?( s ) + p = product[s] + else + raise "Unknown property/attribute #{k}" + end + + case v + when String, Float + assert_equal v.to_s, p.to_s + when Hash + if (p.class == Satsolver::Dependency) + # + # check dependency relations + # + expected = [] + v.each { |k,v| + # + # Convert "<name> <op> <evr>" string to Satsolver::Relation + # + nov = v.split " " # split to name,op,version + if nov.size == 1 + expected << Satsolver::Relation.new( pool, v ) + elsif nov.size == 3 + op = Satsolver::REL_NONE + case nov[1] + when "=", "==" + op = Satsolver::REL_EQ + when "<" + op = Satsolver::REL_LT + when ">" + op = Satsolver::REL_GT + when "<=" + op = Satsolver::REL_LE + when ">=" + op = Satsolver::REL_GE + when "<>", "!=" + op = Satsolver::REL_NE + else + raise "Not a parseable relation operator '#{nov[1]}'" + end + expected << Satsolver::Relation.new( pool, nov[0], op, nov[2] ) + else + raise "Not a parseable relation '#{v}'" + end + } + + # check equal size of solvable dependencies with expected dependencies + assert_equal p.size, expected.size + + # now loop over the dependencies and check them one-by-one + p.each { |dep| + raise "Not a dependency: #{v}" unless expected.include?( dep ) + } + else + raise "Don't know what to do with Hash for property/attribute #{k}" + end + else + raise "Can't handle value class #{v.class} of YAML key #{k}" + end + } + rescue Exception => e + @logf.puts "**ERR #{e}" + raise e + end + end +end -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10238 - /trunk/sat-solver/CMakeLists.txt
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 14:27:59 2008 New Revision: 10238 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10238&view=rev Log: enable testing with ctest Modified: trunk/sat-solver/CMakeLists.txt Modified: trunk/sat-solver/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=10… ============================================================================== --- trunk/sat-solver/CMakeLists.txt (original) +++ trunk/sat-solver/CMakeLists.txt Tue May 27 14:27:59 2008 @@ -161,3 +161,5 @@ COMMAND ${CMAKE_MAKE_PROGRAM} svncheck ${AUTOBUILD_COMMAND} ) + +ENABLE_TESTING() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10237 - /trunk/sat-solver/bindings/solvable.i
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 14:27:33 2008 New Revision: 10237 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10237&view=rev Log: Ruby: raise exception on unknown attribute Ruby: implement Solvable::attr?() to check attribute existance Modified: trunk/sat-solver/bindings/solvable.i Modified: trunk/sat-solver/bindings/solvable.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/solvable.i?r… ============================================================================== --- trunk/sat-solver/bindings/solvable.i (original) +++ trunk/sat-solver/bindings/solvable.i Tue May 27 14:27:33 2008 @@ -194,7 +194,6 @@ { return my_id2str( $self->pool, xsolvable_solvable($self)->arch ); } const char *evr() { return my_id2str( $self->pool, xsolvable_solvable($self)->evr ); } - const char *vendor() { return my_id2str( $self->pool, xsolvable_solvable($self)->vendor ); } #if defined(SWIGRUBY) @@ -293,6 +292,7 @@ /* * Attributes (from Repodata / Repokey) */ + #if defined(SWIGRUBY) /* @@ -317,16 +317,20 @@ else name = StringValuePtr( attrname ); - if (name) { - Id key; - key = str2id( $self->pool, name, 0); - if (key != ID_NULL) { /* key existing in pool ? */ - VALUE result = Qnil; - Solvable *s = xsolvable_solvable($self); - if (repo_lookup( s, key, xsolvable_attr_lookup_callback, &result )) - return result; - } - } + if (!name) + rb_raise( rb_eArgError, "Solvable::[] called with empty arg" ); + + /* key existing in pool ? */ + Id key; + key = str2id( $self->pool, name, 0); + if (key == ID_NULL) + rb_raise( rb_eArgError, "No such attribute '%s'", name ); + + VALUE result = Qnil; + Solvable *s = xsolvable_solvable($self); + if (repo_lookup( s, key, xsolvable_attr_lookup_callback, &result )) + return result; + return Qnil; } @@ -341,6 +345,34 @@ } + /* + * check existance of attribute + */ + %rename( "attr?" ) attr_exists( VALUE attrname ); + VALUE attr_exists( VALUE attrname ) + { + char *name; + + if (SYMBOL_P(attrname)) { + char *colon; + name = rb_id2name( SYM2ID( attrname ) ); + colon = name; + while ((colon = strchr( colon, '_'))) { + *colon++ = ':'; + } + } + else + name = StringValuePtr( attrname ); + + if (!name) + return Qfalse; + + /* key existing in pool ? */ + Id key; + key = str2id( $self->pool, name, 0); + return (key == ID_NULL) ? Qfalse : Qtrue; + } + #endif /* SWIGRUBY */ } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10236 - /trunk/sat-solver/bindings/relation.i
by kkaempf＠svn.opensuse.org 27 May '08

27 May '08

Author: kkaempf Date: Tue May 27 14:26:31 2008 New Revision: 10236 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10236&view=rev Log: define equality operator for relations Modified: trunk/sat-solver/bindings/relation.i Modified: trunk/sat-solver/bindings/relation.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/relation.i?r… ============================================================================== --- trunk/sat-solver/bindings/relation.i (original) +++ trunk/sat-solver/bindings/relation.i Tue May 27 14:26:31 2008 @@ -70,5 +70,12 @@ #endif int match( const Relation *r ) { return evrcmp( $self->pool, relation_evrid( $self ), relation_evrid( r ), EVRCMP_MATCH_RELEASE ) == 0; } + +#if defined(SWIGRUBY) + %alias equal "=="; +#endif + int equal( const Relation *r ) + { return relation_evrid( $self ) == relation_evrid( r ); } + } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10235 - /trunk/libzypp/doc/locks.5
by jreidinger＠svn.opensuse.org 27 May '08

27 May '08

Author: jreidinger Date: Tue May 27 12:01:24 2008 New Revision: 10235 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10235&view=rev Log: update locks manpage Modified: trunk/libzypp/doc/locks.5 Modified: trunk/libzypp/doc/locks.5 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/doc/locks.5?rev=10235&r1… ============================================================================== --- trunk/libzypp/doc/locks.5 (original) +++ trunk/libzypp/doc/locks.5 Tue May 27 12:01:24 2008 @@ -63,7 +63,17 @@ .TP .B query_string -string for all attributes. Can be restricted by attribute with empty value. +string for all attributes. Can be restricted by attribute with empty value ( it is recommended, because without restriction expect some performance problems ). + +.TP +.B version +restrict lock only to some versions. It contains two part, first is operator and second is version. +.br +Operator is \fB==\fR,\fB!=\fR,\fB<\fR,\fB>\fR,\fB<=\fR,\fB>=\fR. If operator is not specified then == is used. +.br +Version have format \fBepoch:version-release\fR. Only version is mandatory. +.br +example - version: < 0:0.11.4-2 .TP .B solvable_name @@ -74,6 +84,10 @@ summary of object .TP +.B solvable_arch +architecture of object (e.g. x86_64, i586) + +.TP .B solvable_description description of object -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0