merge from SLE branch

diff --git a/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-bare-test.xml b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-bare-test.xml
new file mode 100644 (file)
index 0000000..6af580a
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-bare-test.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<test>
+<setup arch="i686">
+  <channel name="sles10" file="../repos/sles10/sles-10-i386-1407-packages.xml"/>
+  <channel name="stable" file="../repos/stable/stable-i386-20060718-packages.xml"/>
+</setup>
+<trial>
+  <install channel="sles10" package="apache2-mod_python"/>
+  <install channel="sles10" package="apache2-prefork"/>
+</trial>
+</test>

diff --git a/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.out b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.out
new file mode 100644 (file)
index 0000000..d7a1f42
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.out
@@ -0,0 +1,124 @@
+Load from File './../repos/sles10/sles-10-i386-1407-default-system.xml'
+Added source '@system' with 657 resolvables
+Loaded 657 resolvables from ../repos/sles10/sles-10-i386-1407-default-system.xml.
+Load from File './../repos/sles10/sles-10-i386-1407-packages.xml'
+Added source 'sles10' with 1886 resolvables
+Loaded 1886 resolvables from ../repos/sles10/sles-10-i386-1407-packages.xml.
+Load from File './../repos/stable/stable-i386-20060718-packages.xml'
+Added source 'stable' with 7670 resolvables
+Loaded 7670 resolvables from ../repos/stable/stable-i386-20060718-packages.xml.
+
+------------------------------------------------
+
+>!> Installing apache2-mod_python from channel sles10
+>!> Installing apache2-prefork from channel sles10
+
+Completed solutions: 4
+Pruned solutions: 0
+Deferred solutions: 0
+Invalid solutions: 0
+
+Best Solution:
+>!> Solution #1:
+Checksum = df284fcf
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.7-3.i586[stable]
+>!> install libapr1-1.2.7-3.i586[stable]
+>!> installs=5, upgrades=0, uninstalls=0
+download size=0.0k, install size=0.0k
+total priority=0, min priority=0, max priority=0
+other penalties=0
+- - - - - - - - - -
+Context Info:
+Context Context:
+Parent @0x3c9b500
+Parent @0x3c991a0
+ResolverContext with 3 entries
+U_Ts_[S2:1][package]apache2-2.2.0-21.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-mod_python-3.1.3-60.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-prefork-2.2.0-21.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U_Ts_[S3:1][package]libapr1-1.2.7-3.i586 : U_Ts_
+ResolverContext with 1 entries
+U_Ts_[S3:1][package]libapr-util1-1.2.7-3.i586 : U_Ts_
+
+
+Other Valid Solutions:
+>!> Solution #2:
+Checksum = a70d5248
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.2-13.2.i586[sles10]
+>!> install libapr1-1.2.7-3.i586[stable]
+>!> installs=5, upgrades=0, uninstalls=0
+download size=0.0k, install size=0.0k
+total priority=0, min priority=0, max priority=0
+other penalties=0
+- - - - - - - - - -
+Context Info:
+Context Context:
+Parent @0x3c9b500
+Parent @0x3c991a0
+ResolverContext with 3 entries
+U_Ts_[S2:1][package]apache2-2.2.0-21.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-mod_python-3.1.3-60.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-prefork-2.2.0-21.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U_Ts_[S3:1][package]libapr1-1.2.7-3.i586 : U_Ts_
+ResolverContext with 1 entries
+U__s_[S2:1][package]libapr-util1-1.2.2-13.2.i586 : U_Ts_
+
+>!> Solution #3:
+Checksum = 2dff0391
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.2-13.2.i586[sles10]
+>!> install libapr1-1.2.2-13.2.i586[sles10]
+>!> installs=5, upgrades=0, uninstalls=0
+download size=0.0k, install size=0.0k
+total priority=0, min priority=0, max priority=0
+other penalties=0
+- - - - - - - - - -
+Context Info:
+Context Context:
+Parent @0x3c9c940
+Parent @0x3c991a0
+ResolverContext with 3 entries
+U_Ts_[S2:1][package]apache2-2.2.0-21.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-mod_python-3.1.3-60.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-prefork-2.2.0-21.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U__s_[S2:1][package]libapr1-1.2.2-13.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U__s_[S2:1][package]libapr-util1-1.2.2-13.2.i586 : U_Ts_
+
+>!> Solution #4:
+Checksum = ebfa8f68
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.7-3.i586[stable]
+>!> install libapr1-1.2.2-13.2.i586[sles10]
+>!> installs=5, upgrades=0, uninstalls=0
+download size=0.0k, install size=0.0k
+total priority=0, min priority=0, max priority=0
+other penalties=0
+- - - - - - - - - -
+Context Info:
+Context Context:
+Parent @0x3c9c940
+Parent @0x3c991a0
+ResolverContext with 3 entries
+U_Ts_[S2:1][package]apache2-2.2.0-21.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-mod_python-3.1.3-60.2.i586 : U_Ts_
+U_Tu_[S2:1][package]apache2-prefork-2.2.0-21.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U__s_[S2:1][package]libapr1-1.2.2-13.2.i586 : U_Ts_
+ResolverContext with 1 entries
+U_Ts_[S3:1][package]libapr-util1-1.2.7-3.i586 : U_Ts_
+
+

diff --git a/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.solution b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.solution
new file mode 100644 (file)
index 0000000..bc0e34a
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.solution
@@ -0,0 +1,30 @@
+>!> Installing apache2-mod_python from channel sles10
+>!> Installing apache2-prefork from channel sles10
+>!> Solution #1:
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.7-3.i586[stable]
+>!> install libapr1-1.2.7-3.i586[stable]
+>!> installs=5, upgrades=0, uninstalls=0
+>!> Solution #2:
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.2-13.2.i586[sles10]
+>!> install libapr1-1.2.7-3.i586[stable]
+>!> installs=5, upgrades=0, uninstalls=0
+>!> Solution #3:
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.2-13.2.i586[sles10]
+>!> install libapr1-1.2.2-13.2.i586[sles10]
+>!> installs=5, upgrades=0, uninstalls=0
+>!> Solution #4:
+>!> install apache2-2.2.0-21.2.i586[sles10]
+>!> install apache2-mod_python-3.1.3-60.2.i586[sles10]
+>!> install apache2-prefork-2.2.0-21.2.i586[sles10]
+>!> install libapr-util1-1.2.7-3.i586[stable]
+>!> install libapr1-1.2.2-13.2.i586[sles10]
+>!> installs=5, upgrades=0, uninstalls=0

diff --git a/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.xml b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.xml
new file mode 100644 (file)
index 0000000..7a7bf3d
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/bugzilla-tests/bug191983-test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<test>
+<setup arch="i686">
+  <system file="../repos/sles10/sles-10-i386-1407-default-system.xml"/>
+  <channel name="sles10" file="../repos/sles10/sles-10-i386-1407-packages.xml"/>
+  <channel name="stable" file="../repos/stable/stable-i386-20060718-packages.xml"/>
+</setup>
+<trial>
+  <install channel="sles10" package="apache2-mod_python"/>
+  <install channel="sles10" package="apache2-prefork"/>
+</trial>
+</test>