From f6462fef91eb9bdfba23d5e787c08b095f279323 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 8 Aug 2006 08:57:33 +0000 Subject: [PATCH] merged SuSE-SLE-10-Branch till rev 3907 --- .../data.deptestomatic/language-tests/ignore | 2 + .../patch-tests/kernel-single-update-test.solution | 54 +++++++++++++++++++ .../patch-tests/kernel-update-test.solution | 55 +++++++++++++++++++ .../selection-tests/bug166212-i686-test.solution | 1 - .../conflict-postfix-sendmail-both-test.solution | 56 +------------------ .../data.deptestomatic/solution-tests/ignore | 4 +- .../yast-tests/kernel3-test.solution | 62 ++++++++++++++++++++++ testsuite/solver/src/deptestomatic.cc | 23 ++++---- 8 files changed, 190 insertions(+), 67 deletions(-) create mode 100644 testsuite/solver/data.deptestomatic/patch-tests/kernel-single-update-test.solution create mode 100644 testsuite/solver/data.deptestomatic/patch-tests/kernel-update-test.solution create mode 100644 testsuite/solver/data.deptestomatic/yast-tests/kernel3-test.solution diff --git a/testsuite/solver/data.deptestomatic/language-tests/ignore b/testsuite/solver/data.deptestomatic/language-tests/ignore index 829baff..310bbb2 100644 --- a/testsuite/solver/data.deptestomatic/language-tests/ignore +++ b/testsuite/solver/data.deptestomatic/language-tests/ignore @@ -1,2 +1,4 @@ # doese not run cause we have no a access to @system beta52-myspell-de_DE-remove-test.xml +# take only the first aspell_LANGUAGE (no default) Bug 162093 +beta52-aspell-unknown-test.xml \ No newline at end of file diff --git a/testsuite/solver/data.deptestomatic/patch-tests/kernel-single-update-test.solution b/testsuite/solver/data.deptestomatic/patch-tests/kernel-single-update-test.solution new file mode 100644 index 0000000..690fca4 --- /dev/null +++ b/testsuite/solver/data.deptestomatic/patch-tests/kernel-single-update-test.solution @@ -0,0 +1,54 @@ +>!> Establishing state ... +>!> Established context +>!> atom:apparmor-docs-2.0-17.4.noarch[multi_source] UI_s_ +>!> atom:apparmor-parser-2.0-21.4.i586[multi_source] UI_s_ +>!> atom:apparmor-profiles-2.0-34.8.noarch[multi_source] UI_s_ +>!> atom:apparmor-utils-2.0-23.4.noarch[multi_source] UI_s_ +>!> atom:cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[multi_source] UI_s_ +>!> atom:cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[multi_source] UI_s_ +>!> atom:kernel-default-2.6.16.21-0.6.i586[multi_source] UI_s_ +>!> atom:kernel-default-2.6.16.21-0.7.i586[single_source] UI_s_ +>!> atom:kernel-xen-2.6.16.21-0.6.i586[multi_source] UI_s_ +>!> atom:kernel-xen-2.6.16.21-0.7.i586[single_source] UI_s_ +>!> atom:kernel-xenpae-2.6.16.21-0.6.i586[multi_source] UI_s_ +>!> atom:kernel-xenpae-2.6.16.21-0.7.i586[single_source] UI_s_ +>!> atom:mkinitrd-1.2-106.14.i586[multi_source] UI_s_ +>!> atom:novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[multi_source] UI_s_ +>!> atom:omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[multi_source] UI_s_ +>!> atom:omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[multi_source] UI_s_ +>!> atom:wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[multi_source] UI_s_ +>!> atom:wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[multi_source] UI_s_ +>!> atom:yast2-apparmor-2.0-27.4.noarch[multi_source] UI_s_ +>!> patch:kernel-1703-0.noarch[multi_source] UI_s_ +>!> patch:single-kernel-1703-0.noarch[single_source] UI_s_ +>!> Installing single-kernel from channel single_source +>!> Solution #1: +>!> install atom:kernel-default-2.6.16.21-0.7.i586[single_source] +>!> install atom:kernel-xen-2.6.16.21-0.7.i586[single_source] +>!> install atom:kernel-xenpae-2.6.16.21-0.7.i586[single_source] +>!> install patch:single-kernel-1703-0.noarch[single_source] +>!> upgrade apparmor-parser-2.0-19.i586 => apparmor-parser-2.0-21.4.i586[multi_source] +>!> upgrade apparmor-profiles-2.0-31.noarch => apparmor-profiles-2.0-34.8.noarch[multi_source] +>!> upgrade cloop-kmp-default-2.01_2.6.16.13_4-22.i586 => cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[multi_source] +>!> upgrade cloop-kmp-xen-2.01_2.6.16.13_4-22.i586 => cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[multi_source] +>!> upgrade kernel-default-2.6.16.13-4.i586 => kernel-default-2.6.16.21-0.7.i586[single_source] +>!> upgrade kernel-xen-2.6.16.13-4.i586 => kernel-xen-2.6.16.21-0.7.i586[single_source] +>!> upgrade kernel-xenpae-2.6.16.13-4.i586 => kernel-xenpae-2.6.16.21-0.7.i586[single_source] +>!> upgrade novfs-kmp-default-1.2.0_2.6.16.13_4-10.i586 => novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[multi_source] +>!> upgrade omnibook-kmp-default-20060126_2.6.16.13_4-4.i586 => omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[multi_source] +>!> upgrade omnibook-kmp-xen-20060126_2.6.16.13_4-4.i586 => omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[multi_source] +>!> upgrade wlan-kmp-default-1_2.6.16.13_4-13.i586 => wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[multi_source] +>!> upgrade wlan-kmp-xen-1_2.6.16.13_4-13.i586 => wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[multi_source] +>!> |satisfied atom:apparmor-parser-2.0-21.4.i586[multi_source] +>!> |satisfied atom:apparmor-profiles-2.0-34.8.noarch[multi_source] +>!> |satisfied atom:cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[multi_source] +>!> |satisfied atom:cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[multi_source] +>!> |satisfied atom:novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[multi_source] +>!> |satisfied atom:omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[multi_source] +>!> |satisfied atom:omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[multi_source] +>!> |satisfied atom:wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[multi_source] +>!> |satisfied atom:wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[multi_source] +>!> installs=4, upgrades=12, uninstalls=0, satisfied=9 +>!> Solution #2: +>!> This solution is a duplicate. +>!> installs=4, upgrades=12, uninstalls=0, satisfied=9 diff --git a/testsuite/solver/data.deptestomatic/patch-tests/kernel-update-test.solution b/testsuite/solver/data.deptestomatic/patch-tests/kernel-update-test.solution new file mode 100644 index 0000000..d70dd8c --- /dev/null +++ b/testsuite/solver/data.deptestomatic/patch-tests/kernel-update-test.solution @@ -0,0 +1,55 @@ +>!> Establishing state ... +>!> Established context +>!> atom:apparmor-docs-2.0-17.4.noarch[new_source] UI_s_ +>!> atom:apparmor-parser-2.0-21.4.i586[new_source] UI_s_ +>!> atom:apparmor-profiles-2.0-34.8.noarch[new_source] UI_s_ +>!> atom:apparmor-utils-2.0-23.4.noarch[new_source] UI_s_ +>!> atom:cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[new_source] UI_s_ +>!> atom:cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[new_source] UI_s_ +>!> atom:kernel-default-2.6.16.21-0.6.i586[new_source] UI_s_ +>!> atom:kernel-xen-2.6.16.21-0.6.i586[new_source] UI_s_ +>!> atom:kernel-xenpae-2.6.16.21-0.6.i586[new_source] UI_s_ +>!> atom:mkinitrd-1.2-106.14.i586[new_source] UI_s_ +>!> atom:novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[new_source] UI_s_ +>!> atom:omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[new_source] UI_s_ +>!> atom:omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[new_source] UI_s_ +>!> atom:wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[new_source] UI_s_ +>!> atom:wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[new_source] UI_s_ +>!> atom:yast2-apparmor-2.0-27.4.noarch[new_source] UI_s_ +>!> patch:kernel-1703-0.noarch[new_source] UI_s_ +>!> Installing kernel from channel new_source +>!> Solution #1: +>!> install atom:apparmor-docs-2.0-17.4.noarch[new_source] +>!> install atom:apparmor-parser-2.0-21.4.i586[new_source] +>!> install atom:apparmor-profiles-2.0-34.8.noarch[new_source] +>!> install atom:apparmor-utils-2.0-23.4.noarch[new_source] +>!> install atom:cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[new_source] +>!> install atom:cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[new_source] +>!> install atom:kernel-default-2.6.16.21-0.6.i586[new_source] +>!> install atom:kernel-xen-2.6.16.21-0.6.i586[new_source] +>!> install atom:kernel-xenpae-2.6.16.21-0.6.i586[new_source] +>!> install atom:mkinitrd-1.2-106.14.i586[new_source] +>!> install atom:novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[new_source] +>!> install atom:omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[new_source] +>!> install atom:omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[new_source] +>!> install atom:wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[new_source] +>!> install atom:wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[new_source] +>!> install atom:yast2-apparmor-2.0-27.4.noarch[new_source] +>!> install patch:kernel-1703-0.noarch[new_source] +>!> upgrade apparmor-docs-2.0-13.noarch => apparmor-docs-2.0-14.7.noarch[new_source] +>!> upgrade apparmor-parser-2.0-19.i586 => apparmor-parser-2.0-21.4.i586[new_source] +>!> upgrade apparmor-profiles-2.0-31.noarch => apparmor-profiles-2.0-34.8.noarch[new_source] +>!> upgrade apparmor-utils-2.0-21.noarch => apparmor-utils-2.0-23.4.noarch[new_source] +>!> upgrade cloop-kmp-default-2.01_2.6.16.13_4-22.i586 => cloop-kmp-default-2.01_2.6.16.21_0.6-22.2.i586[new_source] +>!> upgrade cloop-kmp-xen-2.01_2.6.16.13_4-22.i586 => cloop-kmp-xen-2.01_2.6.16.21_0.6-22.2.i586[new_source] +>!> upgrade kernel-default-2.6.16.13-4.i586 => kernel-default-2.6.16.21-0.6.i586[new_source] +>!> upgrade kernel-xen-2.6.16.13-4.i586 => kernel-xen-2.6.16.21-0.6.i586[new_source] +>!> upgrade kernel-xenpae-2.6.16.13-4.i586 => kernel-xenpae-2.6.16.21-0.6.i586[new_source] +>!> upgrade mkinitrd-1.2-103.i586 => mkinitrd-1.2-106.14.i586[new_source] +>!> upgrade novfs-kmp-default-1.2.0_2.6.16.13_4-10.i586 => novfs-kmp-default-1.2.0_2.6.16.21_0.6-9.2.i586[new_source] +>!> upgrade omnibook-kmp-default-20060126_2.6.16.13_4-4.i586 => omnibook-kmp-default-20060126_2.6.16.21_0.6-3.1.i586[new_source] +>!> upgrade omnibook-kmp-xen-20060126_2.6.16.13_4-4.i586 => omnibook-kmp-xen-20060126_2.6.16.21_0.6-3.1.i586[new_source] +>!> upgrade wlan-kmp-default-1_2.6.16.13_4-13.i586 => wlan-kmp-default-1_2.6.16.21_0.6-12.6.i586[new_source] +>!> upgrade wlan-kmp-xen-1_2.6.16.13_4-13.i586 => wlan-kmp-xen-1_2.6.16.21_0.6-12.6.i586[new_source] +>!> upgrade yast2-apparmor-2.0-27.noarch => yast2-apparmor-2.0-27.4.noarch[new_source] +>!> installs=17, upgrades=16, uninstalls=0 diff --git a/testsuite/solver/data.deptestomatic/selection-tests/bug166212-i686-test.solution b/testsuite/solver/data.deptestomatic/selection-tests/bug166212-i686-test.solution index 81487d0..4ad2f05 100644 --- a/testsuite/solver/data.deptestomatic/selection-tests/bug166212-i686-test.solution +++ b/testsuite/solver/data.deptestomatic/selection-tests/bug166212-i686-test.solution @@ -1,5 +1,4 @@ >!> Installing x11 from channel selections ->!> No problems so far >!> Solution #1: >!> install selection:x11-10-41.noarch[selections] >!> installs=1, upgrades=0, uninstalls=0 diff --git a/testsuite/solver/data.deptestomatic/solution-tests/conflict-postfix-sendmail-both-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/conflict-postfix-sendmail-both-test.solution index c9ad8b3..1ef00c5 100644 --- a/testsuite/solver/data.deptestomatic/solution-tests/conflict-postfix-sendmail-both-test.solution +++ b/testsuite/solver/data.deptestomatic/solution-tests/conflict-postfix-sendmail-both-test.solution @@ -18,7 +18,7 @@ >!> Installing xorg-x11-server from channel packages >!> Installing xorg-x11-server-glx from channel packages >!> Installing yast2-trans-en_US from channel packages ->!> 8 problems found: +>!> 2 problems found: >!> Problem: >!> Cannot install sendmail-8.13.5-5.i586[packages] because it is conflicting with postfix >!> A conflict over sendmail == 8.13.5 (sendmail) requires the removal of to-be-installed sendmail-8.13.5-5.i586[packages] @@ -32,60 +32,6 @@ >!> Ignore this conflict of sendmail >!> >!> Problem: ->!> cron-4.1-31.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of smtp_daemon for cron-4.1-31.i586[packages] ->!> Solution: ->!> do not install cron ->!> do not install cron-4.1-31.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: ->!> gnome-applets-2.12.2-15.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of libpanel-applet-2.so.0 for gnome-applets-2.12.2-15.i586[packages] ->!> Solution: ->!> do not install gnome-applets ->!> do not install gnome-applets-2.12.2-15.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: ->!> gnome-utils-2.12.2-10.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of libpanel-applet-2.so.0 for gnome-utils-2.12.2-10.i586[packages] ->!> Solution: ->!> do not install gnome-utils ->!> do not install gnome-utils-2.12.2-10.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: ->!> lsb-3.0-8.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of /usr/sbin/sendmail for lsb-3.0-8.i586[packages] ->!> Solution: ->!> do not install lsb ->!> do not install lsb-3.0-8.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: ->!> mailx-11.25-3.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of smtp_daemon for mailx-11.25-3.i586[packages] ->!> Solution: ->!> do not install mailx ->!> do not install mailx-11.25-3.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: ->!> mutt-1.5.9i-15.i586[packages] cannot be installed due to missing dependencies ->!> There are no installable providers of smtp_daemon for mutt-1.5.9i-15.i586[packages] ->!> Solution: ->!> do not install mutt ->!> do not install mutt-1.5.9i-15.i586[packages] ->!> Solution: ->!> Ignore this requirement just here ->!> ->!> Problem: >!> postfix-2.2.6-6.i586[packages] conflicts with other resolvables >!> postfix-2.2.6-6.i586[packages] conflicts with: >!> Solution: diff --git a/testsuite/solver/data.deptestomatic/solution-tests/ignore b/testsuite/solver/data.deptestomatic/solution-tests/ignore index 792585e..8aa106d 100644 --- a/testsuite/solver/data.deptestomatic/solution-tests/ignore +++ b/testsuite/solver/data.deptestomatic/solution-tests/ignore @@ -1,3 +1,5 @@ conflict-bug153328-test.xml conflict-postfix-sendmail-test.xml -unfulfilled-3-test.xml \ No newline at end of file +unfulfilled-3-test.xml +# works correctly but can not compare solution (order) +parallel-test.xml \ No newline at end of file diff --git a/testsuite/solver/data.deptestomatic/yast-tests/kernel3-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/kernel3-test.solution new file mode 100644 index 0000000..3bdbe93 --- /dev/null +++ b/testsuite/solver/data.deptestomatic/yast-tests/kernel3-test.solution @@ -0,0 +1,62 @@ +>!> setting HardwareInfo to: ./kernel3-hardware +>!> Installing kernel-default from channel packages +>!> No problems so far +>!> Solution #1: +>!> install aaa_base-10.1-5.i586[packages] +>!> install aaa_skel-2006.2.24-3.i586[packages] +>!> install ash-1.6.1-8.i586[packages] +>!> install bash-3.1-14.i586[packages] +>!> install bzip2-1.0.3-10.i586[packages] +>!> install coreutils-5.93-14.i586[packages] +>!> install cpio-2.6-12.i586[packages] +>!> install cracklib-2.8.6-6.i586[packages] +>!> install cyrus-sasl-2.1.21-10.i586[packages] +>!> install db-4.3.29-8.i686[packages] +>!> install diffutils-2.8.7-10.i586[packages] +>!> install e2fsprogs-1.38-18.i586[packages] +>!> install filesystem-10.0.42-11.i586[packages] +>!> install fillup-1.42-111.i586[packages] +>!> install findutils-4.2.27-6.i586[packages] +>!> install gawk-3.1.5-11.i586[packages] +>!> install gdbm-1.8.3-236.i586[packages] +>!> install glibc-2.4-6.i686[packages] +>!> install gpg-1.4.2-16.i586[packages] +>!> install grep-2.5.1a-12.i586[packages] +>!> install gzip-1.3.5-152.i586[packages] +>!> install info-4.8-15.i586[packages] +>!> install insserv-1.04.0-13.i586[packages] +>!> install kernel-bigsmp-2.6.16_rc6_git1-4.i586[packages] +>!> install kernel-default-2.6.16_rc6_git1-4.i586[packages] +>!> install kernel-smp-2.6.16_rc6_git1-4.i586[packages] +>!> install libacl-2.2.34-5.i586[packages] +>!> install libattr-2.4.28-7.i586[packages] +>!> install libcom_err-1.38-18.i586[packages] +>!> install libgcc-4.1.0-5.i586[packages] +>!> install libstdc++-4.1.0-5.i586[packages] +>!> install libzio-0.1-10.i586[packages] +>!> install logrotate-3.7.3-6.i586[packages] +>!> install mingetty-0.9.6s-81.i586[packages] +>!> install mkinitrd-1.2-77.i586[packages] +>!> install mktemp-1.5-737.i586[packages] +>!> install module-init-tools-3.2.2-16.i586[packages] +>!> install ncurses-5.5-10.i586[packages] +>!> install nld-release-10-10.i586[packages] +>!> install nvidia-gfx-kmp-bigsmp-1.0.8178_2.6.16_rc6_git1_4-1.i586[packages] +>!> install nvidia-gfx-kmp-default-1.0.8178_2.6.16_rc6_git1_4-1.i586[packages] +>!> install nvidia-gfx-kmp-smp-1.0.8178_2.6.16_rc6_git1_4-1.i586[packages] +>!> install openldap2-client-2.3.19-10.i586[packages] +>!> install openssl-0.9.8a-11.i586[packages] +>!> install pam-0.99.3.0-14.i586[packages] +>!> install pciutils-2.2.1-7.i586[packages] +>!> install perl-5.8.8-7.i586[packages] +>!> install perl-Bootloader-0.2.13-2.i586[packages] +>!> install permissions-2006.2.24-3.i586[packages] +>!> install popt-1.7-253.i586[packages] +>!> install readline-5.1-14.i586[packages] +>!> install rpm-4.4.2-25.i586[packages] +>!> install sed-4.1.4-10.i586[packages] +>!> install suse-build-key-1.0-675.noarch[packages] +>!> install udev-085-7.i586[packages] +>!> install util-linux-2.12r-19.i586[packages] +>!> install zlib-1.2.3-8.i586[packages] +>!> installs=57, upgrades=0, uninstalls=0 diff --git a/testsuite/solver/src/deptestomatic.cc b/testsuite/solver/src/deptestomatic.cc index f2610cc..94c34c3 100644 --- a/testsuite/solver/src/deptestomatic.cc +++ b/testsuite/solver/src/deptestomatic.cc @@ -283,7 +283,6 @@ print_sep (void) cout << endl << "------------------------------------------------" << endl << endl; } - static void print_important (const string & str) { @@ -291,12 +290,11 @@ print_important (const string & str) } static void -print_stringList (StringList &stringList ) +print_items (StringList & items) { - stringList.sort (); - - for (StringList::const_iterator iter = stringList.begin(); iter != stringList.end(); iter++) { - RESULT << iter->c_str() << endl; + items.sort(); + for (StringList::const_iterator iter = items.begin(); iter != items.end(); iter++) { + RESULT << (*iter).c_str() << endl; } } @@ -1134,6 +1132,7 @@ print_marked_cb (PoolItem_Ref poolItem, const ResStatus & status, void *data) s << " " << status; slist->push_back (s.str()); } + return; } @@ -1323,9 +1322,10 @@ parse_xml_trial (XmlNode_Ptr node, const ResPool & pool) } else { RESULT << "Established context" << endl; - StringList stringList; - resolver->context()->foreachMarked (print_marked_cb, &stringList); // output moved to stringList - print_stringList (stringList); + StringList items; + + resolver->context()->foreachMarked (print_marked_cb, &items); + print_items (items); // print_pool( MARKER, false ); if (!freshen.empty()) { RESULT << "Freshening ..." << endl; @@ -1342,7 +1342,10 @@ parse_xml_trial (XmlNode_Ptr node, const ResPool & pool) } else { RESULT << "Freshened context" << endl; - resolver->context()->foreachMarked (print_marked_cb, NULL); + StringList items; + + resolver->context()->foreachMarked (print_marked_cb, &items); + print_items (items); } } else if (node->equals ("instorder")) { -- 2.7.4