Author: coolo Date: Sun Oct 14 14:13:03 2007 New Revision: 7526 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7526&view=rev Log: parse <product> out of helix sources Modified: trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-package.solv trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-3-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-3-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-packages1.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug224698-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-6-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-5-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-4-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-2-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-4-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug297795-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308098-1-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-4-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-package.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-system.solv trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug328081-package.solv trunk/sat-solver/testsuite/data.libzypp/freshen-tests/exercise-3-packages.solv trunk/sat-solver/testsuite/data.libzypp/kernel-tests/sl10.1-beta7-packages.solv trunk/sat-solver/testsuite/data.libzypp/repos/openSUSE10.3/openSUSE10.3B2_all.solv trunk/sat-solver/testsuite/data.libzypp/repos/sled10/sled-10-i386-1408-default-system.solv trunk/sat-solver/testsuite/data.libzypp/repos/sles10/sles-10-i386-1407-default-system.solv trunk/sat-solver/testsuite/data.libzypp/yast-tests/kernel1-packages.solv trunk/sat-solver/testsuite/data.libzypp/yast-tests/sl10.1-beta7-packages.solv trunk/sat-solver/testsuite/data.libzypp/yast-tests/sles10-beta7-packages.solv trunk/sat-solver/testsuite/data.libzypp/yast-tests/tpctl-multi-packages.solv trunk/sat-solver/tools/source_helix.c Modified: trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/basic-exercises/Bug299819-2-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-3-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-3-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug217574-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-3-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-3-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug218492-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-packages1.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-packages1.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug222531-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug224698-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug224698-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug225278-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-6-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-6-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-5-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-5-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug238284-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-4-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-4-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239750-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-2-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-2-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-4-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-4-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug292077-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug297795-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug297795-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308098-1-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308098-1-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-4-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-4-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310455-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug326384-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug328081-package.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug328081-package.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/freshen-tests/exercise-3-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/freshen-tests/exercise-3-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/kernel-tests/sl10.1-beta7-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/kernel-tests/sl10.1-beta7-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/repos/openSUSE10.3/openSUSE10.3B2_all.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/repos/openSUSE10.3/openSUSE10.3B2_all.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/repos/sled10/sled-10-i386-1408-default-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/repos/sled10/sled-10-i386-1408-default-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/repos/sles10/sles-10-i386-1407-default-system.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/repos/sles10/sles-10-i386-1407-default-system.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/kernel1-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/kernel1-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/sl10.1-beta7-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/sl10.1-beta7-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/sles10-beta7-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/sles10-beta7-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/tpctl-multi-packages.solv URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/tpctl-multi-packages.solv?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/tools/source_helix.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/source_helix.c?rev=7526&r1=7525&r2=7526&view=diff ============================================================================== --- trunk/sat-solver/tools/source_helix.c (original) +++ trunk/sat-solver/tools/source_helix.c Sun Oct 14 14:13:03 2007 @@ -55,6 +55,7 @@ STATE_PATTERN, STATE_ATOM, STATE_PATCH, + STATE_PRODUCT, STATE_PEPOCH, STATE_PVERSION, @@ -81,6 +82,7 @@ { STATE_SUBCHANNEL, "pattern", STATE_PACKAGE, 0 }, { STATE_SUBCHANNEL, "atom", STATE_PACKAGE, 0 }, { STATE_SUBCHANNEL, "patch", STATE_PACKAGE, 0 }, + { STATE_SUBCHANNEL, "product", STATE_PACKAGE, 0 }, { STATE_PACKAGE, "name", STATE_NAME, 1 }, { STATE_PACKAGE, "epoch", STATE_PEPOCH, 1 }, { STATE_PACKAGE, "version", STATE_PVERSION, 1 }, @@ -440,6 +442,7 @@ pd->pack = 0; break; + case STATE_PACKAGE: /* solvable name */ if ((pd->pack & PACK_BLOCK) == 0) /* alloc new block ? */ @@ -460,6 +463,8 @@ pd->kind = "pattern"; else if (!strcmp(name, "atom")) pd->kind = "atom"; + else if (!strcmp(name, "product")) + pd->kind = "product"; else if (!strcmp(name, "patch")) pd->kind = "patch"; else -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org