Author: schubi2 Date: Thu Jan 17 12:27:29 2008 New Revision: 8310 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8310&view=rev Log: enabled comparing solutions Added: trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution Removed: trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution1 trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution2 Modified: trunk/sat-solver/testsuite/README.FAILS trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict2-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/obsoletes-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-2-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-3-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/uninstall-test.solution trunk/sat-solver/testsuite/runtest.rb Modified: trunk/sat-solver/testsuite/README.FAILS URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/README.FAILS?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/README.FAILS (original) +++ trunk/sat-solver/testsuite/README.FAILS Thu Jan 17 12:27:29 2008 @@ -70,7 +70,6 @@ ./data.libzypp/simple-tests/arch3-test.xml ./data.libzypp/simple-tests/vendor-test.xml ./data.libzypp/solution-tests/conflict-bug153328-test.xml -./data.libzypp/solution-tests/conflict-postfix-sendmail-test.xml ./data.libzypp/solution-tests/conflict-test.xml ./data.libzypp/solution-tests/conflict3-test.xml ./data.libzypp/solution-tests/parallel-test.xml Added: trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution?rev=8310&view=auto ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution (added) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-both-test.solution Thu Jan 17 12:27:29 2008 @@ -0,0 +1,10 @@ +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +package sendmail-8.13.5-5.i586 conflicts with postfix provided by postfix-2.2.6-6.i586 + +- do not install postfix-2.2.6-6.i586 + +- do not install sendmail-8.13.5-5.i586 + Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict-postfix-sendmail-test.solution Thu Jan 17 12:27:29 2008 @@ -1,11 +1,10 @@ ->!> Installing default from channel selections ->!> Installing apparmor from channel selections ->!> Installing base from channel selections ->!> Installing x11 from channel selections ->!> Installing gnome from channel selections ->!> Installing print_server from channel selections +>!> Installing selection:default from channel selections +>!> Installing selection:apparmor from channel selections +>!> Installing selection:base from channel selections +>!> Installing selection:x11 from channel selections +>!> Installing selection:gnome from channel selections +>!> Installing selection:print_server from channel selections

!> Installing sendmail from channel packages ->!> Installing postfix from channel packages !> Installing kernel-default from channel packages !> Installing libusb from channel packages !> Installing sax2-libsax from channel packages @@ -18,83 +17,644 @@ !> 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: ->!> 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] ->!> Solution: ->!> do not install sendmail ->!> do not install sendmail-8.13.5-5.i586[packages] ->!> Solution: ->!> do not install postfix ->!> do not install postfix-2.2.6-6.i586[packages] ->!> Solution: ->!> 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: ->!> do not install postfix ->!> do not install postfix-2.2.6-6.i586[packages] ->!> Solution: ->!> do not install sendmail ->!> do not install sendmail-8.13.5-5.i586[packages] ->!> Solution: ->!> Ignore this conflict of postfix ->!> ->!> Calculating installation order ... +>!> Solution #1: +>!> !unflag gnome-panel-2.12.2-14.i586[packages] +>!> install selection:default-10-35.noarch[selections] +>!> install selection:apparmor-10-35.noarch[selections] +>!> install selection:base-10-35.noarch[selections] +>!> install selection:x11-10-35.noarch[selections] +>!> install selection:gnome-10-35.noarch[selections] +>!> install selection:print_server-10-35.noarch[selections] +>!> install sendmail-8.13.5-5.i586[packages] +>!> install kernel-default-2.6.16_rc3-2.i586[packages] +>!> install libusb-0.1.11-2.i586[packages] +>!> install sax2-libsax-7.1-79.i586[packages] +>!> install sax2-7.1-79.i586[packages] +>!> install sax2-gui-1.7-79.i586[packages] +>!> install sax2-ident-1.7-79.i586[packages] +>!> install sax2-libsax-perl-7.1-79.i586[packages] +>!> install sax2-tools-2.7-79.i586[packages] +>!> install xorg-x11-6.9.0-12.i586[packages] +>!> install xorg-x11-server-6.9.0-12.i586[packages] +>!> install xorg-x11-server-glx-6.9.0-12.i586[packages] +>!> install yast2-trans-en_US-2.12.1-3.noarch[packages] +>!> install bash-3.1-8.i586[packages] +>!> install coreutils-5.93-10.i586[packages] +>!> install cyrus-sasl-2.1.21-6.i586[packages] +>!> install filesystem-10.0.42-7.i586[packages] +>!> install fillup-1.42-108.i586[packages] +>!> install insserv-1.04.0-8.i586[packages] +>!> install m4-1.4.4-2.i586[packages] +>!> install openldap2-client-2.3.19-4.i586[packages] +>!> install openssl-0.9.8a-7.i586[packages] +>!> install perl-5.8.8-3.i586[packages] +>!> install procmail-3.22-45.i586[packages] +>!> install sed-4.1.4-7.i586[packages] +>!> install tcpd-7.6-720.i586[packages] +>!> install netcfg-10.0.42-2.noarch[packages] +>!> install mkinitrd-1.2-67.i586[packages] +>!> install libgcc-4.1.0_20060210-3.i586[packages] +>!> install libstdc++-4.1.0_20060210-3.i586[packages] +>!> install 855resolution-0.4-8.i586[packages] +>!> install fvwm2-2.5.12-6.i586[packages] +>!> install qt3-3.3.5-29.i586[packages] +>!> install xorg-x11-libs-6.9.0-12.i586[packages] +>!> install binutils-2.16.91.0.5-4.i586[packages] +>!> install dbus-1-0.60-9.i586[packages] +>!> install hal-0.5.6-8.i586[packages] +>!> install ncurses-5.5-5.i586[packages] +>!> install readline-5.1-8.i586[packages] +>!> install sysfsutils-1.3.0-5.i586[packages] +>!> install Mesa-6.4.2-2.i586[packages] +>!> install netpbm-10.26.22-3.i586[packages] +>!> install cpp-4.1.0_20060210-3.i586[packages] +>!> install expat-2.0.0-3.i586[packages] +>!> install fontconfig-2.3.93.20060210-2.i586[packages] +>!> install freetype2-2.1.10-6.i586[packages] +>!> install grep-2.5.1a-8.i586[packages] +>!> install libjpeg-6.2.0-741.i586[packages] +>!> install libpng-1.2.8-8.i586[packages] +>!> install pam-0.99.3.0-4.i586[packages] +>!> install permissions-2006.1.25-1.i586[packages] +>!> install resmgr-0.9.8_SVNr75-3.i586[packages] +>!> install x11-tools-0.1-24.i586[packages] +>!> install zlib-1.2.3-5.i586[packages] +>!> install xkeyboard-config-0.7-5.noarch[packages] +>!> install info-4.8-12.i586[packages] +>!> install libacl-2.2.34-2.i586[packages] +>!> install libattr-2.4.28-2.i586[packages] +>!> install gdbm-1.8.3-233.i586[packages] +>!> install gzip-1.3.5-147.i586[packages] +>!> install aaa_base-10.0.42-52.i586[packages] +>!> install cpio-2.6-8.i586[packages] +>!> install e2fsprogs-1.38-15.i586[packages] +>!> install gawk-3.1.5-6.i586[packages] +>!> install module-init-tools-3.2.2-6.i586[packages] +>!> install pciutils-2.2.1-4.i586[packages] +>!> install udev-084-5.i586[packages] +>!> install util-linux-2.12r-10.i586[packages] +>!> install fribidi-0.10.4-488.i586[packages] +>!> install glib-1.2.10-599.i586[packages] +>!> install gtk-1.2.10-896.i586[packages] +>!> install imlib-1.9.14-202.i586[packages] +>!> install libstroke-0.5.1-4.i586[packages] +>!> install mktemp-1.5-734.i586[packages] +>!> install xdg-menu-0.2-55.i586[packages] +>!> install xli-20050904-5.i586[packages] +>!> install desktop-data-NLD-10.1-9.noarch[packages] +>!> install libmng-1.0.9-6.i586[packages] +>!> install libxml2-2.6.23-3.i586[packages] +>!> install pwdutils-3.0.7.1-3.i586[packages] +>!> install dbus-1-glib-0.60-9.i586[packages] +>!> install glib2-2.8.5-8.i586[packages] +>!> install libdrm-2.0-5.i586[packages] +>!> install openmotif-libs-2.2.4-7.i586[packages] +>!> install libnetpbm-1.0.0-646.i586[packages] +>!> install libtiff-3.8.0-4.i586[packages] +>!> install cracklib-2.8.6-2.i586[packages] +>!> install bzip2-1.0.3-7.i586[packages] +>!> install libzio-0.1-7.i586[packages] +>!> install aaa_skel-2006.1.25-1.i586[packages] +>!> install ash-1.6.1-5.i586[packages] +>!> install diffutils-2.8.7-6.i586[packages] +>!> install findutils-4.2.27-3.i586[packages] +>!> install logrotate-3.7.3-3.i586[packages] +>!> install mingetty-0.9.6s-78.i586[packages] +>!> install sles-release-9.90-12.i586[packages] +>!> install libcom_err-1.38-15.i586[packages] +>!> install gnome-filesystem-0.1-243.i586[packages] +>!> install giflib-4.1.4-3.i586[packages] +>!> install perl-XML-Parser-2.34-33.i586[packages] +>!> install liblcms-1.15-2.i586[packages] +>!> install libnscd-1.1-6.i586[packages] +>!> install libxcrypt-2.4-2.i586[packages] +>!> install openslp-1.2.0-9.i586[packages] +>!> install pam-modules-10.0.42-15.i586[packages] +>!> install popt-1.7-242.i586[packages] +>!> install glibc-2.3.90-65.i686[packages] +>!> install db-4.3.29-5.i686[packages] +>!> install 3ddiag-0.729-3.i586[packages] +>!> install hwinfo-12.5-2.i586[packages] +>!> install CheckHardware-0.1-975.i586[packages] +>!> install MozillaFirefox-1.5.0.1-8.i586[packages] +>!> install atk-1.10.3-4.i586[packages] +>!> install cairo-1.0.2-12.i586[packages] +>!> install gconf2-2.12.1-12.i586[packages] +>!> install glitz-0.4.4-10.i586[packages] +>!> install gnome-vfs2-2.12.2-23.i586[packages] +>!> install gtk2-2.8.10-11.i586[packages] +>!> install libbonobo-2.10.1-11.i586[packages] +>!> install libgnome-2.12.0.1-11.i586[packages] +>!> install mozilla-nspr-4.6.1-12.i586[packages] +>!> install mozilla-nss-3.11-11.i586[packages] +>!> install orbit2-2.12.4-6.i586[packages] +>!> install pango-1.10.2-9.i586[packages] +>!> install desktop-file-utils-0.10-10.i586[packages] +>!> install fam-server-2.6.10-136.i586[packages] +>!> install gnome-mime-data-2.4.2-9.i586[packages] +>!> install krb5-1.4.3-6.i586[packages] +>!> install libsmbclient-3.0.21b-5.i586[packages] +>!> install mDNSResponder-107.5-3.i586[packages] +>!> install alsa-1.0.11-9.i586[packages] +>!> install audiofile-0.2.6-7.i586[packages] +>!> install esound-0.2.36-6.i586[packages] +>!> install libidl-0.8.6-7.i586[packages] +>!> install fam-2.6.10-136.i586[packages] +>!> install dialog-0.9b-194.i586[packages] +>!> install MozillaFirefox-translations-1.5.0.1-8.i586[packages] +>!> install SDL-1.2.9-6.i586[packages] +>!> install aalib-1.4.0-292.i586[packages] +>!> install gpm-1.20.1-311.i586[packages] +>!> install slang-2.0.5-4.i586[packages] +>!> install SPident-0.9-63.noarch[packages] +>!> install SuSEfirewall2-3.4_SVNr135-3.noarch[packages] +>!> install iptables-1.3.5-2.i586[packages] +>!> install lsof-4.76-3.i586[packages] +>!> install acl-2.2.34-2.i586[packages] +>!> install acpid-1.0.4-17.i586[packages] +>!> install apparmor-docs-2.0-4.noarch[packages] +>!> install apparmor-parser-2.0-9.i586[packages] +>!> install apparmor-profiles-2.0-6.noarch[packages] +>!> install apparmor-utils-2.0-6.noarch[packages] +>!> install perl-DBD-SQLite-1.11-2.i586[packages] +>!> install perl-DBI-1.50-2.i586[packages] +>!> install perl-TimeDate-1.16-126.i586[packages] +>!> install sqlite-3.2.8-3.i586[packages] +>!> install perl-PlRPC-0.2018-3.i586[packages] +>!> install perl-Net-Daemon-0.38-51.i586[packages] +>!> install aspell-0.60.3-8.i586[packages] +>!> install aspell-af-0.50.0-12.i586[packages] +>!> install at-3.1.8-910.i586[packages] +>!> install at-spi-1.6.6-4.i586[packages] +>!> install gail-1.8.8-4.i586[packages] +>!> install libart_lgpl-2.3.17-7.i586[packages] +>!> install libgnomecanvas-2.12.0-8.i586[packages] +>!> install libglade2-2.5.1-13.i586[packages] +>!> install attr-2.4.28-2.i586[packages] +>!> install audit-1.1.3-6.i586[packages] +>!> install audit-libs-1.1.3-6.i586[packages] +>!> install autofs-4.1.4-11.i586[packages] +>!> install autoyast2-2.13.19-2.noarch[packages] +>!> install libxslt-1.1.15-4.i586[packages] +>!> install yast2-core-2.13.17-2.i586[packages] +>!> install yast2-xml-2.13.1-2.i586[packages] +>!> install autoyast2-installation-2.13.19-2.noarch[packages] +>!> install yast2-schema-2.13.1-2.noarch[packages] +>!> install libgcrypt-1.2.2-3.i586[packages] +>!> install libgpg-error-1.0-6.i586[packages] +>!> install blocxx-1.0.0-2.i586[packages] +>!> install liby2util-2.13.3-3.i586[packages] +>!> install netcat-1.10-873.i586[packages] +>!> install pcre-6.4-4.i586[packages] +>!> install yast2-2.13.27-2.i586[packages] +>!> install yast2-transfer-2.13.2-2.i586[packages] +>!> install perl-Config-Crontab-1.11-2.i586[packages] +>!> install yast2-hardware-detection-2.13.3-2.i586[packages] +>!> install yast2-pkg-bindings-2.13.3-2.i586[packages] +>!> install yast2-theme-SuSELinux-2.13.3-2.noarch[packages] +>!> install curl-7.15.1-5.i586[packages] +>!> install wireless-tools-28pre13-11.i586[packages] +>!> install libzypp-0.0.7-18.i586[packages] +>!> install boost-1.33.1-4.i586[packages] +>!> install rpm-4.4.2-14.i586[packages] +>!> install libicu-3.4-5.i586[packages] +>!> install suse-build-key-1.0-671.noarch[packages] +>!> install gpg-1.4.2-10.i586[packages] +>!> install yast2-qt-2.13.13-4.i586[packages] +>!> install autoyast2-utils-2.13.19-2.noarch[packages] +>!> install mkisofs-2.01-12.i586[packages] +>!> install zisofs-tools-1.0.6-5.i586[packages] +>!> install awesfx-0.5.0d-5.i586[packages] +>!> install bc-1.06-753.i586[packages] +>!> install bind-libs-9.3.2-5.i586[packages] +>!> install bind-utils-9.3.2-5.i586[packages] +>!> install bitstream-vera-1.10-170.noarch[packages] +>!> install bootcycle-0.3-101.i586[packages] +>!> install grub-0.97-3.i586[packages] +>!> install bootloader-theme-SLES-2006.1.25-1.noarch[packages] +>!> install bootsplash-3.3-5.i586[packages] +>!> install bootsplash-theme-SuSE-SLES-3.1-53.i586[packages] +>!> install busybox-1.1.0-3.i586[packages] +>!> install cabextract-1.1-6.i586[packages] +>!> install cdparanoia-IIIalpha9.8-551.i586[packages] +>!> install cdrdao-1.2.0-5.i586[packages] +>!> install libao-0.8.6-8.i586[packages] +>!> install libogg-1.1.3-3.i586[packages] +>!> install libvorbis-1.1.2-3.i586[packages] +>!> install cdrecord-2.01-12.i586[packages] +>!> install checkmedia-2.1-2.i586[packages] +>!> install compat-2006.1.25-1.i586[packages] +>!> install compat-openssl097g-0.9.7g-2.i586[packages] +>!> install compat-libstdc++-5.0.7-9.i586[packages] +>!> install control-center2-2.12.2-16.i586[packages] +>!> install evolution-data-server-1.5.90cvs20060206-3.i586[packages] +>!> install gnome-desktop-2.12.2-6.i586[packages] +>!> install gnome-keyring-0.4.6-4.i586[packages] +>!> install gnome-menus-2.12.0-12.i586[packages] +>!> install gstreamer-0.8.11-13.i586[packages] +>!> install gstreamer-plugins-0.8.11-18.i586[packages] +>!> install libbonoboui-2.10.1-11.i586[packages] +>!> install libgnomeui-2.12.0-11.i586[packages] +>!> install libxklavier-2.1-4.i586[packages] +>!> install metacity-2.12.2-8.i586[packages] +>!> install nautilus-2.12.2-17.i586[packages] +>!> install shared-mime-info-0.16-7.i586[packages] +>!> install startup-notification-0.8-9.i586[packages] +>!> install gnome-audio-2.0.0-122.noarch[packages] +>!> install gnutls-1.2.10-2.i586[packages] +>!> install libsoup-2.2.90-4.i586[packages] +>!> install libgnomesu-1.0.0-13.i586[packages] +>!> install gnome-icon-theme-2.12.1-6.noarch[packages] +>!> install eel-2.12.2-6.i586[packages] +>!> install libbeagle-0.2.1-18.i586[packages] +>!> install libcroco-0.6.0-12.i586[packages] +>!> install libexif-0.6.13-10.i586[packages] +>!> install libgsf-1.13.3-8.i586[packages] +>!> install librsvg-2.12.7-4.i586[packages] +>!> install gnome2-user-docs-2.8.1-9.noarch[packages] +>!> install libopencdk-0.5.5-5.i586[packages] +>!> install lzo-2.02-2.i586[packages] +>!> install libgnomeprint-2.12.1-8.i586[packages] +>!> install libgnomeprintui-2.12.1-7.i586[packages] +>!> install cups-libs-1.1.23-27.i586[packages] +>!> install libgnomecups-0.2.2-6.i586[packages] +>!> install convmv-1.09-2.noarch[packages] +>!> install cpufrequtils-0.4-2.i586[packages] +>!> install cron-4.1-31.i586[packages] +>!> install cups-1.1.23-27.i586[packages] +>!> install cups-client-1.1.23-27.i586[packages] +>!> install foomatic-filters-3.0.2-8.i586[packages] +>!> install ghostscript-fonts-std-8.15.2rc1-7.i586[packages] +>!> install a2ps-4.13-1063.i586[packages] +>!> install file-4.16-4.i586[packages] +>!> install wdiff-0.5.2-664.i586[packages] +>!> install ghostscript-x11-8.15.2rc1-7.i586[packages] +>!> install ghostscript-library-8.15.2rc1-7.i586[packages] +>!> install hplip-hpijs-0.9.7-4.i586[packages] +>!> install libgimpprint-4.2.7-49.i586[packages] +>!> install net-snmp-5.3.0.1-3.i586[packages] +>!> install perl-TermReadKey-2.30-3.i586[packages] +>!> install cups-SUSE-ppds-dat-1.1.20-107.i586[packages] +>!> install cups-backends-1.0-6.i586[packages] +>!> install ncpfs-2.2.6-11.i586[packages] +>!> install cups-drivers-1.1.23-15.i586[packages] +>!> install sysvinit-2.86-9.i586[packages] +>!> install cups-drivers-stp-1.1.23-15.i586[packages] +>!> install cyrus-sasl-saslauthd-2.1.21-6.i586[packages] +>!> install db-utils-4.3.29-5.i586[packages] +>!> install dbus-1-python-0.60-9.i586[packages] +>!> install libxml2-python-2.6.23-3.i586[packages] +>!> install python-2.4.2-5.i586[packages] +>!> install dbus-1-x11-0.60-9.i586[packages] +>!> install deltarpm-3.3-2.i586[packages] +>!> install device-mapper-1.02.02-4.i586[packages] +>!> install devs-10.0.42-3.i586[packages] +>!> install dhcpcd-1.3.22pl4-213.i586[packages] +>!> install net-tools-1.60-570.i586[packages] +>!> install dirmngr-0.9.2-4.i586[packages] +>!> install libksba-0.9.12-4.i586[packages] +>!> install dmraid-0.99_1.0.0rc8-4.i586[packages] +>!> install dos2unix-3.1-306.i586[packages] +>!> install dosbootdisk-1.1-42.i586[packages] +>!> install dosfstools-2.11-5.i586[packages] +>!> install dvd+rw-tools-6.1-2.i586[packages] +>!> install ed-0.2-871.i586[packages] +>!> install efont-unicode-0.4.2-8.noarch[packages] +>!> install eject-2.1.0-2.i586[packages] +>!> install elilo-3.6-2.i586[packages] +>!> install ethtool-3-5.i586[packages] +>!> install evince-0.4.0-10.i586[packages] +>!> install poppler-0.4.4-6.i586[packages] +>!> install poppler-glib-0.4.4-6.i586[packages] +>!> install evms-2.5.4-3.i586[packages] +>!> install evms-gui-2.5.4-3.i586[packages] +>!> install fbset-2.1-787.i586[packages] +>!> install file-roller-2.12.2-6.i586[packages] +>!> install unrar-3.5.4-5.i586[packages] +>!> install unzip-5.52-6.i586[packages] +>!> install filters-2006.1.25-1.i586[packages] +>!> install finger-1.3-4.i586[packages] +>!> install flac-1.1.2-5.i586[packages] +>!> install fonts-config-20060207-2.noarch[packages] +>!> install freeglut-051110-4.i586[packages] +>!> install freetype-1.3.1-1162.i586[packages] +>!> install gal2-2.5.3-9.i586[packages] +>!> install gcalctool-5.6.31-8.i586[packages] +>!> install gconf-editor-2.12.1-4.i586[packages] +>!> install gdb-6.4-4.i586[packages] +>!> install gdk-pixbuf-0.22.0-82.i586[packages] +>!> install gdm-2.8.0.7-22.i586[packages] +>!> install gnome-themes-2.12.1-16.i586[packages] +>!> install xorg-x11-Xnest-6.9.0-12.i586[packages] +>!> install gnome2-NLD-10.0-9.noarch[packages] +>!> install gtk2-engines-2.6.7-4.i586[packages] +>!> install tango-icon-theme-0.6.7-3.noarch[packages] +>!> install gtk-engines-0.12-969.i586[packages] +>!> install gedit-2.12.1-8.i586[packages] +>!> install gtksourceview-1.5.6-6.i586[packages] +>!> install gettext-0.14.5-3.i586[packages] +>!> install ghostscript-fonts-other-8.15.2rc1-7.i586[packages] +>!> install gle-3.0.6-650.i586[packages] +>!> install glib-sharp2-2.8.0-9.i586[packages] +>!> install mono-core-1.1.13.2-5.i586[packages] +>!> install glibc-i18ndata-2.3.90-65.i586[packages] +>!> install glibc-locale-2.3.90-65.i586[packages] +>!> install gmime-2.1.18-6.i586[packages] +>!> install gtk-sharp2-2.8.0-9.i586[packages] +>!> install gnome-cups-manager-0.32cvs20060120-9.i586[packages] +>!> install gnome-doc-utils-0.5.3-4.i586[packages] +>!> install gnome-keyring-manager-2.12.0-4.i586[packages] +>!> install gnome-media-2.12.0-5.i586[packages] +>!> install gstreamer-plugins-default-0.8.11-18.i586[packages] +>!> install gstreamer-plugins-extra-0.8.11-18.i586[packages] +>!> install nautilus-cd-burner-2.12.2-4.i586[packages] +>!> install sox-12.17.9-3.i586[packages] +>!> install libcdio-0.76-5.i586[packages] +>!> install arts-1.5.1-4.i586[packages] +>!> install jack-0.100.0-6.i586[packages] +>!> install libmikmod-3.1.11-3.i586[packages] +>!> install libmusicbrainz-2.1.2-2.i586[packages] +>!> install libtheora-1.0alpha5-4.i586[packages] +>!> install libcddb-1.2.1-7.i586[packages] +>!> install vcdimager-0.7.23-8.i586[packages] +>!> install libsndfile-1.0.12-2.i586[packages] +>!> install gnome-nettool-1.4.1-4.i586[packages] +>!> install gnome-power-manager-0.3.4-12.i586[packages] +>!> install gnome-screensaver-0.0.25-8.i586[packages] +>!> install libnotify-0.3.2-4.i586[packages] +>!> install libwnck-2.12.2-8.i586[packages] +>!> install notification-daemon-0.3.2-5.i586[packages] +>!> install xscreensaver-4.23-4.i586[packages] +>!> install libsexy-0.1.5-7.i586[packages] +>!> install iso-codes-0.49-4.noarch[packages] +>!> install gnome-printer-add-1.0.1-4.i586[packages] +>!> install gnome-session-2.12.0-63.i586[packages] +>!> install gnome-spell2-1.0.6-9.i586[packages] +>!> install gnome-system-monitor-2.12.2-4.i586[packages] +>!> install libgtop-2.12.2-7.i586[packages] +>!> install gnome-terminal-2.12.0-5.i586[packages] +>!> install vte-0.11.16-8.i586[packages] +>!> install gnome-volume-manager-1.5.13-4.i586[packages] +>!> install gpart-0.1h-482.i586[packages] +>!> install gpg2-1.9.18-5.i586[packages] +>!> install pinentry-0.7.2-4.i586[packages] +>!> install gpgme-1.0.3-5.i586[packages] +>!> install groff-1.18.1.1-17.i586[packages] +>!> install gtk2-themes-0.1-643.noarch[packages] +>!> install gtkhtml2-3.9.90.1cvs20060206-3.i586[packages] +>!> install gtkspell-2.0.11-9.i586[packages] +>!> install gucharmap-1.4.4-4.i586[packages] +>!> install guile-1.6.7-10.i586[packages] +>!> install hal-gnome-0.5.6-8.i586[packages] +>!> install python-gnome-2.12.3-4.i586[packages] +>!> install python-gtk-2.8.2-4.i586[packages] +>!> install python-numeric-24.2-2.i586[packages] +>!> install python-orbit-2.0.1-8.i586[packages] +>!> install hal-resmgr-0.1_SVNr74-2.i586[packages] +>!> install hdparm-6.3-3.i586[packages] +>!> install hfsutils-3.2.6-1041.i586[packages] +>!> install htdig-3.2.0b6-10.i586[packages] +>!> install ifnteuro-1.2.1-196.noarch[packages] +>!> install ifplugd-0.28-5.i586[packages] +>!> install info2html-1.4-5.noarch[packages] +>!> install initviocons-0.4-306.i586[packages] +>!> install input-utils-2005.08.02-3.i586[packages] +>!> install intlfnts-1.2.1-196.noarch[packages] +>!> install ipmitool-1.8.6-2.i586[packages] +>!> install iproute2-2.6.15-2.i586[packages] +>!> install iputils-ss021109-156.i586[packages] +>!> install isapnp-1.26-495.i586[packages] +>!> install jfsutils-1.1.10-3.i586[packages] +>!> install joe-3.3-5.i586[packages] +>!> install kbd-1.12-50.i586[packages] +>!> install kdelibs3-3.5.1-16.i586[packages] +>!> install OpenEXR-1.2.2-5.i586[packages] +>!> install libidn-0.6.0-3.i586[packages] +>!> install libjasper-1.701.0-5.i586[packages] +>!> install kernel-update-tool-0.9-18.noarch[packages] +>!> install klogd-1.4.1-548.i586[packages] +>!> install ksh-93q-16.i586[packages] +>!> install ksymoops-2.4.11-7.i586[packages] +>!> install latex2html-pngicons-2002.2.1-368.noarch[packages] +>!> install ldapcpplib-0.0.4-2.i586[packages] +>!> install less-394-3.i586[packages] +>!> install libaio-0.3.104-4.i586[packages] +>!> install libapparmor-2.0-5.i586[packages] +>!> install libcap-1.92-489.i586[packages] +>!> install libdaemon-0.10-2.i586[packages] +>!> install libevent-1.1-3.i586[packages] +>!> install libgda-1.3.91-17.i586[packages] +>!> install libgnomedb-1.3.91-9.i586[packages] +>!> install libgsf-gnome-1.13.3-8.i586[packages] +>!> install libgssapi-0.6-2.i586[packages] +>!> install libpcap-0.9.4-2.i586[packages] +>!> install libraw1394-1.2.0-3.i586[packages] +>!> install librpcsecgss-0.7-2.i586[packages] +>!> install libsamplerate-0.1.2-5.i586[packages] +>!> install libtool-1.5.22-3.i586[packages] +>!> install lilo-22.7-7.i586[packages] +>!> install limal-1.1.3-2.i586[packages] +>!> install limal-bootloader-1.0.5-3.i586[packages] +>!> install limal-perl-1.1.3-2.i586[packages] +>!> install perl-Bootloader-0.2.10-2.i586[packages] +>!> install limal-ca-mgm-1.1.10-2.i586[packages] +>!> install limal-ca-mgm-perl-1.1.10-2.i586[packages] +>!> install log4net-1.2.9-5.i586[packages] +>!> install mono-data-1.1.13.2-5.i586[packages] +>!> install mono-web-1.1.13.2-5.i586[packages] +>!> install lsb-3.0-8.i586[packages] +>!> install mailx-11.25-3.i586[packages] +>!> install make-3.80-191.i586[packages] +>!> install man-2.4.1-226.i586[packages] +>!> install patch-2.5.9-150.i586[packages] +>!> install pax-3.4-4.i586[packages] +>!> install procps-3.2.6-5.i586[packages] +>!> install psmisc-22.1-4.i586[packages] +>!> install rsync-2.6.6-5.i586[packages] +>!> install tar-1.15.1-10.i586[packages] +>!> install lukemftp-1.5-583.i586[packages] +>!> install lvm2-2.02.01-4.i586[packages] +>!> install man-pages-2.20-2.noarch[packages] +>!> install manufacturer-PPDs-0.5-2.i586[packages] +>!> install master-boot-code-1.6-8.i586[packages] +>!> install mdadm-2.2-9.i586[packages] +>!> install microcode_ctl-1.13-2.i586[packages] +>!> install mozilla-xulrunner-1.8.0.1-11.i586[packages] +>!> install mpt-status-1.0-3.i586[packages] +>!> install multipath-tools-0.4.6-6.i586[packages] +>!> install mutt-1.5.9i-15.i586[packages] +>!> install nautilus-open-terminal-0.6-4.i586[packages] +>!> install nautilus-share-0.6.4-13.i586[packages] +>!> install samba-3.0.21b-5.i586[packages] +>!> install samba-client-3.0.21b-5.i586[packages] +>!> install cifs-mount-3.0.21b-5.i586[packages] +>!> install ncompress-4.2.4-5.i586[packages] +>!> install netdate-1.2-581.i586[packages] +>!> install nfs-utils-1.0.7-20.i586[packages] +>!> install nfsidmap-0.12-2.i586[packages] +>!> install portmap-5beta-739.i586[packages] +>!> install syslog-ng-1.6.8-8.i586[packages] +>!> install nscd-2.3.90-65.i586[packages] +>!> install ntfsprogs-1.11.2-3.i586[packages] +>!> install openct-0.6.6-4.i586[packages] +>!> install opensc-0.9.6-6.i586[packages] +>!> install pcsc-lite-1.2.9_beta9-3.i586[packages] +>!> install openslp-server-1.2.0-9.i586[packages] +>!> install openssh-4.2p1-6.i586[packages] +>!> install openssh-askpass-4.2p1-6.i586[packages] +>!> install opie-2.4-554.i586[packages] +>!> install parted-1.6.25.1-2.i586[packages] +>!> install pmtools-20050823-12.i586[packages] +>!> install powersave-0.11.11-2.i586[packages] +>!> install powersave-libs-0.11.11-2.i586[packages] +>!> install ppp-2.4.3-22.i586[packages] +>!> install pptp-1.7.0-3.i586[packages] +>!> install prctl-1.3-358.i586[packages] +>!> install procinfo-18-45.i586[packages] +>!> install providers-2006.1.25-1.noarch[packages] +>!> install recode-3.6-494.i586[packages] +>!> install reiserfs-3.6.19-6.i586[packages] +>!> install release-notes-sles-10-9.i586[packages] +>!> install rrdtool-1.2.12-2.i586[packages] +>!> install rsh-0.17-562.i586[packages] +>!> install rug-7.1.1-2.i586[packages] +>!> install zmd-7.1.1-3.i586[packages] +>!> install libzypp-zmd-backend-0.0.7-18.i586[packages] +>!> install sash-3.7-36.i586[packages] +>!> install scpm-1.1.3-3.i586[packages] +>!> install screen-4.0.2-52.i586[packages] +>!> install utempter-0.5.5-6.i586[packages] +>!> install scsi-1.7_2.36_1.18_0.16_0.96-3.i586[packages] +>!> install sensors-2.9.2-5.i586[packages] +>!> install sharutils-4.6-2.i586[packages] +>!> install siga-10.101-2.noarch[packages] +>!> install w3m-0.5.1-7.i586[packages] +>!> install sitar-1.0.2-2.noarch[packages] +>!> install smartmontools-5.33-10.i586[packages] +>!> install smpppd-1.59-8.i586[packages] +>!> install wvdial-1.54-71.i586[packages] +>!> install wvstreams-4.2.1-2.i586[packages] +>!> install star-1.5a70-2.i586[packages] +>!> install strace-4.5.12-9.i586[packages] +>!> install sudo-1.6.8p12-6.i586[packages] +>!> install susehelp-2006.02.07-2.noarch[packages] +>!> install wget-1.10.2-4.i586[packages] +>!> install apache2-2.2.0-6.i586[packages] +>!> install libapr-util1-1.2.2-2.i586[packages] +>!> install libapr1-1.2.2-3.i586[packages] +>!> install susehelp_de-2006.02.07-2.noarch[packages] +>!> install apache2-prefork-2.2.0-6.i586[packages] +>!> install sysconfig-0.50.3-3.i586[packages] +>!> install syslinux-3.11-8.i586[packages] +>!> install system-tools-backends-1.4.1-6.noarch[packages] +>!> install tcl-8.4.12-6.i586[packages] +>!> install tcpdump-3.9.4-3.i586[packages] +>!> install tcsh-6.14.00-5.i586[packages] +>!> install telnet-1.2-4.i586[packages] +>!> install terminfo-5.5-5.i586[packages] +>!> install thinkeramik-style-3.2.1-10.i586[packages] +>!> install tightvnc-1.2.9-187.i586[packages] +>!> install xorg-x11-Xvnc-6.9.0-12.i586[packages] +>!> install timezone-2.3.90-65.i586[packages] +>!> install tk-8.4.12-3.i586[packages] +>!> install unclutter-8-839.i586[packages] +>!> install usbutils-0.71-10.i586[packages] +>!> install vim-6.4.6-6.i586[packages] +>!> install vino-2.12.0-7.i586[packages] +>!> install vlan-1.8-29.i586[packages] +>!> install vlock-1.3-533.i586[packages] +>!> install wol-0.7.1-5.i586[packages] +>!> install x11-input-synaptics-0.14.4-2.i586[packages] +>!> install xaw3d-1.5E-228.i586[packages] +>!> install xbanner-1.31-862.i586[packages] +>!> install xdmbgrd-0.5-33.i586[packages] +>!> install xfsprogs-2.7.11-5.i586[packages] +>!> install xinetd-2.3.14-4.i586[packages] +>!> install xlockmore-5.21-2.i586[packages] +>!> install xntp-4.2.0a-58.i586[packages] +>!> install xntp-doc-4.2.0a-58.i586[packages] +>!> install xorg-x11-driver-video-6.9.0-16.i586[packages] +>!> install xorg-x11-driver-video-nvidia-6.9.0-16.i586[packages] +>!> install xorg-x11-fonts-75dpi-6.9.0-12.i586[packages] +>!> install xorg-x11-fonts-scalable-6.9.0-12.i586[packages] +>!> install xorg-x11-man-6.9.0-12.i586[packages] +>!> install xterm-208-2.i586[packages] +>!> install xtermset-0.5.2-124.i586[packages] +>!> install yast2-apparmor-2.0-8.noarch[packages] +>!> install yast2-backup-2.13.0-2.noarch[packages] +>!> install yast2-network-2.13.24-2.i586[packages] +>!> install yast2-storage-2.13.25-2.i586[packages] +>!> install yast2-tune-2.13.2-2.i586[packages] +>!> install yast2-update-2.13.0-2.i586[packages] +>!> install yast2-nfs-client-2.13.2-2.noarch[packages] +>!> install yast2-country-2.13.13-2.i586[packages] +>!> install yast2-packager-2.13.20-2.i586[packages] +>!> install yast2-inetd-2.13.0-2.noarch[packages] +>!> install yast2-perl-bindings-2.13.4-2.i586[packages] +>!> install yast2-storage-lib-2.13.25-2.i586[packages] +>!> install yast2-installation-2.13.13-4.noarch[packages] +>!> install yast2-trans-stats-2.11.0-8.noarch[packages] +>!> install yast2-users-2.13.12-2.i586[packages] +>!> install perl-gettext-1.05-3.i586[packages] +>!> install yast2-bootloader-2.13.13-2.i586[packages] +>!> install yast2-mouse-2.13.7-2.i586[packages] +>!> install yast2-online-update-2.13.3-2.i586[packages] +>!> install perl-Digest-SHA1-2.10-5.i586[packages] +>!> install yast2-ldap-client-2.13.8-2.noarch[packages] +>!> install yast2-mail-aliases-2.13.2-2.noarch[packages] +>!> install yast2-pam-2.13.1-2.noarch[packages] +>!> install yast2-security-2.13.1-2.noarch[packages] +>!> install yast2-ldap-2.13.1-2.i586[packages] +>!> install yast2-slp-2.13.0-2.i586[packages] +>!> install yast2-boot-server-2.13.0-2.noarch[packages] +>!> install yast2-bootfloppy-2.13.13-2.i586[packages] +>!> install yast2-ca-management-2.13.13-2.noarch[packages] +>!> install perl-Config-IniFiles-2.39-3.i586[packages] +>!> install perl-Date-Calc-5.4-4.i586[packages] +>!> install perl-URI-1.35-5.i586[packages] +>!> install perl-X500-DN-0.28-123.i586[packages] +>!> install perl-Bit-Vector-6.4-3.i586[packages] +>!> install perl-Parse-RecDescent-1.80-249.i586[packages] +>!> install perl-Carp-Clan-5.3-3.i586[packages] +>!> install yast2-cd-creator-2.12.4-2.noarch[packages] +>!> install yast2-control-center-2.13.2-2.i586[packages] +>!> install yast2-dhcp-server-2.13.0-2.noarch[packages] +>!> install yast2-dns-server-2.13.6-2.noarch[packages] +>!> install yast2-firewall-2.13.4-2.noarch[packages] +>!> install yast2-heartbeat-2.13.3-2.noarch[packages] +>!> install yast2-http-server-2.13.7-2.noarch[packages] +>!> install yast2-instserver-2.13.6-2.noarch[packages] +>!> install yast2-irda-2.13.0-2.noarch[packages] +>!> install yast2-kerberos-client-2.13.2-2.noarch[packages] +>!> install yast2-ldap-server-2.13.7-2.noarch[packages] +>!> install yast2-mail-2.13.2-2.noarch[packages] +>!> install yast2-ncurses-2.13.6-2.i586[packages] +>!> install yast2-nfs-server-2.13.2-2.noarch[packages] +>!> install yast2-nis-client-2.13.1-2.i586[packages] +>!> install yast2-nis-server-2.13.1-2.noarch[packages] +>!> install yast2-ntp-client-2.13.1-2.noarch[packages] +>!> install yast2-power-management-2.13.4-2.i586[packages] +>!> install yast2-powertweak-2.13.4-2.noarch[packages] +>!> install yast2-sysconfig-2.13.4-2.noarch[packages] +>!> install yast2-printer-2.13.2-2.i586[packages] +>!> install yast2-profile-manager-2.13.3-2.i586[packages] +>!> install yast2-repair-2.13.2-2.noarch[packages] +>!> install yast2-restore-2.13.0-2.noarch[packages] +>!> install yast2-runlevel-2.13.4-2.noarch[packages] +>!> install yast2-samba-client-2.13.5-2.noarch[packages] +>!> install yast2-samba-server-2.13.5-2.noarch[packages] +>!> install perl-Crypt-SmbHash-0.12-3.i586[packages] +>!> install perl-Digest-MD4-1.5-3.i586[packages] +>!> install yast2-sound-2.13.7-2.i586[packages] +>!> install yast2-support-2.13.0-2.noarch[packages] +>!> install yast2-tftp-server-2.13.2-2.noarch[packages] +>!> install yast2-vm-2.13.17-2.i586[packages] +>!> install yast2-x11-2.13.6-18.noarch[packages] +>!> install yast2-you-server-2.13.3-2.i586[packages] +>!> install yp-tools-2.9-6.i586[packages] +>!> install ypbind-1.19.1-3.i586[packages] +>!> install zen-updater-0.1.0-13.i586[packages] +>!> install zenity-2.12.1-4.i586[packages] +>!> install zip-2.31-5.i586[packages] +>!> install zsh-4.2.6-5.i586[packages] +>!> installs=638, upgrades=0, uninstalls=0

Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict2-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict2-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/conflict2-test.solution Thu Jan 17 12:27:29 2008 @@ -1,14 +1,10 @@ ->!> Installing B from channel test ->!> 1 problems found: ->!> Problem: ->!> Cannot install B, because it is conflicting with A ->!> A conflict over B == 1.0-1 (B) requires the removal of B-1.0-1.noarch[test] which is scheduled for installation ->!> Solution: ->!> do not install B ->!> do not install B-1.0-1.noarch[test] ->!> Solution: ->!> delete A ->!> delete A-1.0-1.noarch ->!> Solution: ->!> Ignore this conflict of B ->!> +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +package A-1.0-1.noarch conflicts with B provided by B-1.0-1.noarch + +- allow deinstallation of A-1.0-1.noarch + +- do not install B-1.0-1.noarch + Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/obsoletes-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/obsoletes-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/obsoletes-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/obsoletes-test.solution Thu Jan 17 12:27:29 2008 @@ -1,15 +1,10 @@ ->!> Installing foonew from channel test ->!> Installing foo from channel test ->!> 1 problems found: ->!> Problem: ->!> Cannot install foo, because it is conflicting with foonew ->!> A conflict over foo == 2.0-1 (foo) requires the removal of foo-2.0-1.noarch[test] which is scheduled for installation ->!> Solution: ->!> do not install foo ->!> do not install foo-2.0-1.noarch[test] ->!> Solution: ->!> do not install foonew ->!> do not install foonew-2.0-1.noarch[test] ->!> Solution: ->!> Ignore this conflict of foo ->!> +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +package foonew-2.0-1.noarch obsoletes foo provided by foo-2.0-1.noarch + +- do not install foo-2.0-1.noarch + +- do not install foonew-2.0-1.noarch + Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-2-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-2-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-2-test.solution Thu Jan 17 12:27:29 2008 @@ -1,11 +1,8 @@ ->!> Installing unfulfilled from channel test ->!> 1 problems found: ->!> Problem: ->!> unfulfilled cannot be installed due to missing dependencies ->!> There are no installable providers of nothere for unfulfilled-1.0-1.noarch[test] ->!> Solution: ->!> do not install unfulfilled ->!> do not install unfulfilled-1.0-1.noarch[test] ->!> Solution: ->!> Ignore this requirement just here ->!> +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +nothing provides nothere needed by unfulfilled-1.0-1.noarch + +- do not install unfulfilled-1.0-1.noarch + Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-3-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-3-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-3-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/unfulfilled-3-test.solution Thu Jan 17 12:27:29 2008 @@ -1,14 +1,26 @@ ->!> Installing unfulfilled1 from channel test ->!> Installing unfulfilled2 from channel test ->!> Installing unfulfilled3 from channel test ->!> Installing unfulfilled4 from channel test ->!> 1 problems found: ->!> Problem: ->!> unfulfilled4 cannot be installed due missing dependencies ->!> There are no installable providers of nothere for unfulfilled4-1.0-1.noarch[test] ->!> Solution: ->!> do not install unfulfilled4 ->!> do not install unfulfilled4-1.0-1.noarch[test] ->!> Solution: ->!> Ignore this requirement just here ->!> +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +nothing provides nothere needed by unfulfilled1-1.0-1.noarch + +- do not install unfulfilled1-1.0-1.noarch + +Problem 2: +==================================== +nothing provides nothere needed by unfulfilled2-1.0-1.noarch + +- do not install unfulfilled2-1.0-1.noarch + +Problem 3: +==================================== +nothing provides nothere needed by unfulfilled3-1.0-1.noarch + +- do not install unfulfilled3-1.0-1.noarch + +Problem 4: +==================================== +nothing provides nothere needed by unfulfilled4-1.0-1.noarch + +- do not install unfulfilled4-1.0-1.noarch + Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/uninstall-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/uninstall-test.solution?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/uninstall-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/uninstall-test.solution Thu Jan 17 12:27:29 2008 @@ -1,14 +1,10 @@ ->!> Uninstalling foo ->!> 1 problems found: ->!> Problem: ->!> foo2 has missing dependencies ->!> There are no alternative providers of foo installed for foo2-1.0-1.noarch ->!> Solution: ->!> keep foo ->!> keep foo-1.0-1.noarch ->!> Solution: ->!> delete foo2 ->!> delete foo2-1.0-1.noarch ->!> Solution: ->!> Ignore this requirement just here ->!> +Encountered problems! Here are the solutions: + +Problem 1: +==================================== +package foo2-1.0-1.noarch requires foo, but none of the providers can be installed + +- allow deinstallation of foo2-1.0-1.noarch + +- do not deinstall foo + Modified: trunk/sat-solver/testsuite/runtest.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/runtest.rb?rev=8310&r1=8309&r2=8310&view=diff ============================================================================== --- trunk/sat-solver/testsuite/runtest.rb (original) +++ trunk/sat-solver/testsuite/runtest.rb Thu Jan 17 12:27:29 2008 @@ -87,23 +87,51 @@ def Solution.read fname solutions = Array.new solution = nil + problemFound = false # read solution and filter irrelevant lines IO.foreach( fname ) { |l| + l = l + "\n" case l.chomp! - when /Installing/, /unflag/ - next when /Solution \#([0-9]+):/ + if solution && !solution.empty? + if problemFound + solutions << solution # no sorting + else + solutions << solution.sort! + end + end solution = Array.new - when /installs=/ - solutions << solution.sort! unless solution.empty? - solution = nil + problemFound = false + when /Problem ([0-9]+):/ + if solution && !solution.empty? + if problemFound + solutions << solution # no sorting + else + solutions << solution.sort! + end + end + solution = Array.new + problemFound = true when /> install /, /> upgrade /, /> remove / STDERR.puts "No 'Solution' in #{fname}" unless solution solution << l + else + if problemFound + solution << l + end end } + # last entry insert + if solution && !solution.empty? + if problemFound + solutions << solution # no sorting + else + solutions << solution.sort! + end + end + solutions end @@ -116,10 +144,10 @@ STDERR.puts "Cannot open #{rname}" return CompareResult::Incomplete end - + solutions = Solution.read sname results = Solution.read rname - + if (solutions.empty? && results.empty?) if ( $fails.member?( rname ) ) STDERR.puts "#{rname} passed" @@ -129,34 +157,51 @@ end end - r = results.first - solutions.each { |s| - if s == r - if ( $fails.member?( rname ) ) - STDERR.puts "#{rname} passed" - return CompareResult::UnexpectedPass - else - return CompareResult::KnownPass - end - end - } - + # solutions,results is an array of sulutions AND problems + # As the SAT solver does returns only one sulution and one or more + # problems ALL these entries has to fit to the given solution + + if solutions.size == results.size + solutionFit = false + results.each { |r| + solutionFit = false + solutions.each { |s| + if s == r + solutionFit = true + break + end + } + } + if solutionFit + if ( $fails.member?( rname ) ) + STDERR.puts "#{rname} passed" + return CompareResult::UnexpectedPass + else + return CompareResult::KnownPass + end + end + else + if $verbose + puts "The number of results does not fit to the number of given solutions." + end + end + if ( $fails.member?( rname ) ) return CompareResult::KnownFailure end case sname - when /\.solution[23]$/ + when /\.solution([2-9]+)$/ # we print error with solution1 return CompareResult::UnexpectedFailure end + STDERR.puts "#{rname} failed" - system( "./diffres #{sname} #{rname}") - #STDERR.puts "Solution:" - #pp solutions.first - #STDERR.puts "Result:" - #pp r + if $verbose + Solution.filediff( sname, rname) +# system( "diff -U 0 #{sname} #{rname}") + end return CompareResult::UnexpectedFailure end @@ -173,7 +218,9 @@ puts "#{$tests.size} tests ahead" $tests.sort! $tests.each { |test| -# puts "Testing #{test}" + if $verbose + puts "Testing #{test}" + end basename = File.basename(test, ".xml") #print "." #STDOUT.flush @@ -228,7 +275,7 @@ if File.directory?( fullname ) rundir( fullname, recurse ) elsif (arg =~ /test.xml$/) -# puts "Run #{fullname}" +# puts "Run #{fullname}" $tests << fullname end end -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org