Zypp Commits

Download

zypp-commit@lists.opensuse.org

February 2009

7 participants
171 discussions

[zypp-commit] <libzypp-testsuite> ceanup
by Stefan Schubert 02 Feb '09

02 Feb '09

ref: refs/heads/master commit 04d80074ca4166fa5087da90ebc63e364baa1032 Author: Stefan Schubert <schubi(a)suse.de> Date: Mon Feb 2 11:34:05 2009 +0100 ceanup --- .../bugzilla-tests/bug328393-test.solution | 4 +- .../bugzilla-tests/bug436923-test.solution1 | 2 +- .../bugzilla-tests/bug436923-test.solution2 | 2 +- .../patch-tests/patch-test.solution | 17 +--- .../remove-still-needed1-test.solution | 2 +- .../remove-still-needed2-test.solution | 2 +- .../remove-still-needed3-test.solution | 2 +- .../solution-queue-tests/uninstall-test.solution | 2 +- .../solution-tests/393969-test.solution | 4 +- .../solution-tests/bug400840-test.solution | 2 +- .../solution-tests/extra-conflict-test.solution | 2 +- .../solution-tests/product-test.solution | 19 ----- .../solution-tests/product-test.solution1 | 19 +++++ .../solution-tests/product-test.solution2 | 86 ++++++++++++++++++++ .../remove-still-needed2-test.solution | 2 +- .../remove-still-needed3-test.solution | 2 +- .../solution-tests/uninstall-test.solution | 2 +- 17 files changed, 125 insertions(+), 46 deletions(-) diff --git a/solver/data.deptestomatic/bugzilla-tests/bug328393-test.solution b/solver/data.deptestomatic/bugzilla-tests/bug328393-test.solution index 91ed6b5..5138448 100644 --- a/solver/data.deptestomatic/bugzilla-tests/bug328393-test.solution +++ b/solver/data.deptestomatic/bugzilla-tests/bug328393-test.solution @@ -1081,7 +1081,7 @@ >!> do not install aqbanking-2.3.2-0.pm.1.i586 >!> >!> Solution: ->!> Ignore some dependencies of aqbanking-lang +>!> ignore some dependencies of aqbanking-lang >!> >!> Problem: >!> gstreamer010-plugins-good-0.10.6-39.i586 requires gstreamer010 = 0.10.13, but this requirement cannot be provided @@ -1093,6 +1093,6 @@ >!> Following actions will be done: >!> do not install gstreamer010-0.10.14-0.pm.2.i586 >!> Solution: ->!> Ignore some dependencies of gstreamer010-plugins-good +>!> ignore some dependencies of gstreamer010-plugins-good >!> >!> No valid solution found. diff --git a/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution1 b/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution1 index 2e93417..fcde635 100644 --- a/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution1 +++ b/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution1 @@ -20,7 +20,7 @@ >!> do not install monodevelop-boo-1.0-96.19.noarch >!> >!> Solution: ->!> Ignore some dependencies of monodevelop-boo +>!> ignore some dependencies of monodevelop-boo >!> >!> Taking solution: 0 >!> For problem: 0 diff --git a/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution2 b/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution2 index f2c97f1..0659d03 100644 --- a/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution2 +++ b/solver/data.deptestomatic/bugzilla-tests/bug436923-test.solution2 @@ -20,7 +20,7 @@ >!> do not install monodevelop-boo-1.0-96.19.noarch >!> >!> Solution: ->!> Ignore some dependencies of monodevelop-boo +>!> ignore some dependencies of monodevelop-boo >!> >!> Taking solution: 0 >!> For problem: 0 diff --git a/solver/data.deptestomatic/patch-tests/patch-test.solution b/solver/data.deptestomatic/patch-tests/patch-test.solution index 33dd6c7..b4cc82c 100644 --- a/solver/data.deptestomatic/patch-tests/patch-test.solution +++ b/solver/data.deptestomatic/patch-tests/patch-test.solution @@ -1,6 +1,6 @@ >!> rpm-2186-0 from channel patch IS NOT SATISFIED >!> UB_s_(1417)patch:rpm-2186-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1418)patch:kernel-debug-2393-0-11.0.noarch(patch) IS SATISFIED >!> UB_s_(1419)patch:java-1_4_2-sun-2426-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1420)patch:openssl-2175-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1421)patch:openssl-devel-32bit-2141-0-11.0.noarch(patch) IS SATISFIED @@ -38,9 +38,9 @@ >!> US_s_(1471)patch:postgresql-server-2276-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1472)patch:timezone-2623-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1473)patch:timezone-2313-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1474)patch:kernel-1900-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1475)patch:kernel-xen-2605-0-11.0.noarch(patch) IS SATISFIED +>!> US_s_(1476)patch:kernel-xen-2096-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1477)patch:jasper-3139-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1479)patch:freetype2-3067-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1480)patch:freetype2-devel-32bit-1918-0-11.0.noarch(patch) IS SATISFIED @@ -49,7 +49,6 @@ >!> US_s_(1486)patch:module-init-tools-1935-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1487)patch:module-init-tools-2234-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1493)patch:texinfo-2263-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1494)patch:yast2-mail-server-2126-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1495)patch:krb5-2440-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1496)patch:krb5-server-3046-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1497)patch:libgsf-2363-0-11.0.noarch(patch) IS SATISFIED @@ -61,7 +60,7 @@ >!> US_s_(1504)patch:xorg-x11-server-2062-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1505)patch:xorg-x11-server-1913-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1506)patch:xorg-x11-server-2449-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS BROKEN +>!> US_s_(1507)patch:xorg-x11-server-3083-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1508)patch:xorg-x11-server-1850-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1510)patch:libsoup-2501-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1511)patch:xpdf-tools-2474-0-11.0.noarch(patch) IS SATISFIED @@ -109,18 +108,12 @@ >!> US_s_(1576)patch:libtiff-1908-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1578)patch:xscreensaver-3241-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1580)patch:pwdutils-1912-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1583)patch:libmusicbrainz-2042-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1585)patch:poppler-2589-0-11.0.noarch(patch) IS SATISFIED ->!> UB_s_(1588)patch:qt-2187-0-11.0.noarch(patch) IS BROKEN ->!> UB_s_(1589)patch:qt-32bit-3047-0-11.0.noarch(patch) IS BROKEN >!> US_s_(1591)patch:python-2167-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1592)patch:sysvinit-2259-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1593)patch:glibc-2113-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1594)patch:Mesa-2177-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1595)patch:yast2-samba-client-2223-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1596)patch:gpg-1959-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1597)patch:gpg-2355-0-11.0.noarch(patch) IS SATISFIED ->!> US_s_(1598)patch:gpg-2994-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1599)patch:spamassassin-3078-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1600)patch:spamassassin-2521-0-11.0.noarch(patch) IS SATISFIED >!> US_s_(1601)patch:openssh-2184-0-11.0.noarch(patch) IS SATISFIED diff --git a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed1-test.solution b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed1-test.solution index 56b19ce..2bcce85 100644 --- a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed1-test.solution +++ b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed1-test.solution @@ -9,7 +9,7 @@ >!> keep A >!> >!> Solution: ->!> Ignore some dependencies of B +>!> ignore some dependencies of B >!> >!> Taking solution: 2 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed2-test.solution b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed2-test.solution index 1552aff..3c44b98 100644 --- a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed2-test.solution +++ b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed2-test.solution @@ -9,7 +9,7 @@ >!> keep A >!> >!> Solution: ->!> Ignore some dependencies of B +>!> ignore some dependencies of B >!> >!> Taking solution: 0 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed3-test.solution b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed3-test.solution index 56b19ce..2bcce85 100644 --- a/solver/data.deptestomatic/solution-queue-tests/remove-still-needed3-test.solution +++ b/solver/data.deptestomatic/solution-queue-tests/remove-still-needed3-test.solution @@ -9,7 +9,7 @@ >!> keep A >!> >!> Solution: ->!> Ignore some dependencies of B +>!> ignore some dependencies of B >!> >!> Taking solution: 2 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-queue-tests/uninstall-test.solution b/solver/data.deptestomatic/solution-queue-tests/uninstall-test.solution index 9726ff4..da84c22 100644 --- a/solver/data.deptestomatic/solution-queue-tests/uninstall-test.solution +++ b/solver/data.deptestomatic/solution-queue-tests/uninstall-test.solution @@ -9,6 +9,6 @@ >!> keep foo >!> >!> Solution: ->!> Ignore some dependencies of foo2 +>!> ignore some dependencies of foo2 >!> >!> No valid solution found. diff --git a/solver/data.deptestomatic/solution-tests/393969-test.solution b/solver/data.deptestomatic/solution-tests/393969-test.solution index 57786cd..7c49c48 100644 --- a/solver/data.deptestomatic/solution-tests/393969-test.solution +++ b/solver/data.deptestomatic/solution-tests/393969-test.solution @@ -19,7 +19,7 @@ >!> keep beagle-0.2.18-30.i586 >!> >!> Solution: ->!> Ignore some dependencies of kerry +>!> ignore some dependencies of kerry >!> >!> Taking solution: 1 >!> For problem: 0 @@ -35,7 +35,7 @@ >!> keep libbeagle-0.2.18-23.i586 >!> >!> Solution: ->!> Ignore some dependencies of kerry +>!> ignore some dependencies of kerry >!> >!> Taking solution: 1 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-tests/bug400840-test.solution b/solver/data.deptestomatic/solution-tests/bug400840-test.solution index d4fc1b7..015c75b 100644 --- a/solver/data.deptestomatic/solution-tests/bug400840-test.solution +++ b/solver/data.deptestomatic/solution-tests/bug400840-test.solution @@ -24,7 +24,7 @@ >!> do not install cscope-debugsource-15.6-93.1.i586 >!> >!> Solution: ->!> Ignore some dependencies of cscope-debuginfo +>!> ignore some dependencies of cscope-debuginfo >!> >!> Taking solution: 3 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution b/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution index 4029da2..a205ec2 100644 --- a/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution +++ b/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution @@ -11,7 +11,7 @@ >!> do not ask to delete all solvables providing sqlite3 >!> >!> Solution: ->!> Ignore some dependencies of perl-DBD-SQLite +>!> ignore some dependencies of perl-DBD-SQLite >!> >!> Taking solution: 1 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-tests/product-test.solution b/solver/data.deptestomatic/solution-tests/product-test.solution deleted file mode 100644 index 7e359cd..0000000 --- a/solver/data.deptestomatic/solution-tests/product-test.solution +++ /dev/null @@ -1,19 +0,0 @@ ->!> Requesting locale de_DE ->!> Installing openSUSE-release from channel prodtest ->!> Installing test from channel LocalStuff ->!> 1 problems found: ->!> Problem: ->!> test-2-1.i586 conflicts with openSUSE-release = 11.0.42-11 provided by product:openSUSE-11.0.42.i586 ->!> ->!> Solution: ->!> do not install test-2-1.i586 ->!> ->!> Solution: ->!> do not install product:openSUSE-11.0.42.i586 ->!> ->!> Taking solution: 1 ->!> For problem: 0 ->!> No problems so far ->!> No problems so far ->!> Solution : ->!> install test-2-1.i586[LocalStuff] diff --git a/solver/data.deptestomatic/solution-tests/product-test.solution1 b/solver/data.deptestomatic/solution-tests/product-test.solution1 new file mode 100644 index 0000000..7e359cd --- /dev/null +++ b/solver/data.deptestomatic/solution-tests/product-test.solution1 @@ -0,0 +1,19 @@ +>!> Requesting locale de_DE +>!> Installing openSUSE-release from channel prodtest +>!> Installing test from channel LocalStuff +>!> 1 problems found: +>!> Problem: +>!> test-2-1.i586 conflicts with openSUSE-release = 11.0.42-11 provided by product:openSUSE-11.0.42.i586 +>!> +>!> Solution: +>!> do not install test-2-1.i586 +>!> +>!> Solution: +>!> do not install product:openSUSE-11.0.42.i586 +>!> +>!> Taking solution: 1 +>!> For problem: 0 +>!> No problems so far +>!> No problems so far +>!> Solution : +>!> install test-2-1.i586[LocalStuff] diff --git a/solver/data.deptestomatic/solution-tests/product-test.solution2 b/solver/data.deptestomatic/solution-tests/product-test.solution2 new file mode 100644 index 0000000..b867c26 --- /dev/null +++ b/solver/data.deptestomatic/solution-tests/product-test.solution2 @@ -0,0 +1,86 @@ +>!> Requesting locale de_DE +>!> Installing openSUSE-release from channel prodtest +>!> Installing test from channel LocalStuff +>!> 1 problems found: +>!> Problem: +>!> test-2-1.i586 conflicts with openSUSE-release = 11.0.42-11 provided by product:openSUSE-11.0.42.i586 +>!> +>!> Solution: +>!> Following actions will be done: +>!> do not install product:openSUSE-11.0.42.i586 +>!> Solution: +>!> do not install test-2-1.i586 +>!> +>!> Taking solution: 1 +>!> For problem: 0 +>!> No problems so far +>!> No problems so far +>!> Solution : +>!> install aaa_base-11.0.42-9.i586[prodtest] +>!> install audit-libs-1.7.4-5.i586[prodtest] +>!> install bash-3.2-118.i586[prodtest] +>!> install bash-doc-3.2-77.i586[prodtest] +>!> install binutils-2.18.50.20080718-2.i586[prodtest] +>!> install bundle-lang-common-de-11.0-135.noarch[prodtest] +>!> install bundle-lang-common-en-11.0-135.noarch[prodtest] +>!> install bzip2-1.0.5-18.i586[prodtest] +>!> install coreutils-6.12-6.i586[prodtest] +>!> install cpio-2.9-65.i586[prodtest] +>!> install cracklib-2.8.12-31.i586[prodtest] +>!> install cracklib-dict-full-2.8.12-27.i586[prodtest] +>!> install cron-4.1-177.i586[prodtest] +>!> install cyrus-sasl-2.1.22-147.i586[prodtest] +>!> install diffutils-2.8.7-123.i586[prodtest] +>!> install filesystem-11.0.42-9.i586[prodtest] +>!> install fillup-1.42-221.i586[prodtest] +>!> install findutils-4.4.0-18.i586[prodtest] +>!> install gawk-3.1.6-5.i586[prodtest] +>!> install glibc-2.8-22.i686[prodtest] +>!> install grep-2.5.2-78.i586[prodtest] +>!> install info-4.12-5.i586[prodtest] +>!> install insserv-1.11.0-37.i586[prodtest] +>!> install libacl-2.2.47-3.i586[prodtest] +>!> install libasound2-1.0.17-2.i586[prodtest] +>!> install libattr-2.4.39-45.i586[prodtest] +>!> install libbz2-1-1.0.5-18.i586[prodtest] +>!> install libdb-4_5-4.5.20-73.i586[prodtest] +>!> install libgcc43-4.3.2_20080715-2.i586[prodtest] +>!> install libldap-2_4-2-2.4.10-9.i586[prodtest] +>!> install libncurses5-5.6-85.i586[prodtest] +>!> install libnscd-2.0.2-86.i586[prodtest] +>!> install libopenssl0_9_8-0.9.8h-6.i586[prodtest] +>!> install libreadline5-5.2-77.i586[prodtest] +>!> install libstdc++43-4.3.2_20080715-2.i586[prodtest] +>!> install libvolume_id-125-2.i586[prodtest] +>!> install libxcrypt-3.0.1-5.i586[prodtest] +>!> install libzio-0.7-13.i586[prodtest] +>!> install login-3.36-8.i586[prodtest] +>!> install logrotate-3.7.5-53.i586[prodtest] +>!> install mingetty-1.0.7s-71.i586[prodtest] +>!> install module-init-tools-3.4-20.i586[prodtest] +>!> install ncurses-utils-5.6-85.i586[prodtest] +>!> install net-tools-1.60-696.i586[prodtest] +>!> install netcfg-11.0.42-4.noarch[prodtest] +>!> install openSUSE-release-11.0.42-11.i586[prodtest] +>!> install openldap2-client-2.4.10-9.i586[prodtest] +>!> install openslp-1.2.0-149.i586[prodtest] +>!> install openssl-0.9.8h-6.i586[prodtest] +>!> install openssl-certs-0.9.8h-5.noarch[prodtest] +>!> install pam-1.0.1-13.i586[prodtest] +>!> install pam-modules-11.0.42-4.i586[prodtest] +>!> install pcre-7.6-27.i586[prodtest] +>!> install perl-base-5.10.0-42.i586[prodtest] +>!> install permissions-2008.7.15-3.i586[prodtest] +>!> install popt-1.7-434.i586[prodtest] +>!> install postfix-2.5.1-37.i586[prodtest] +>!> install psmisc-22.6-35.i586[prodtest] +>!> install pwdutils-3.2.1-19.i586[prodtest] +>!> install readline-doc-5.2-77.i586[prodtest] +>!> install rpm-4.4.2-206.i586[prodtest] +>!> install sed-4.1.5-108.i586[prodtest] +>!> install smartlink-softmodem-2.9.10-209.i586[prodtest] +>!> install sysvinit-2.86-155.i586[prodtest] +>!> install terminfo-base-5.6-85.i586[prodtest] +>!> install udev-125-2.i586[prodtest] +>!> install zlib-1.2.3-118.i586[prodtest] +>!> install product:openSUSE-11.0.42.i586[prodtest] diff --git a/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution b/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution index f731c56..bff9796 100644 --- a/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution +++ b/solver/data.deptestomatic/solution-tests/remove-still-needed2-test.solution @@ -10,7 +10,7 @@ >!> keep A-1.0-1.noarch >!> >!> Solution: ->!> Ignore some dependencies of B +>!> ignore some dependencies of B >!> >!> Taking solution: 0 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution b/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution index c1431db..b87bdc7 100644 --- a/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution +++ b/solver/data.deptestomatic/solution-tests/remove-still-needed3-test.solution @@ -10,7 +10,7 @@ >!> keep A-1.0-1.noarch >!> >!> Solution: ->!> Ignore some dependencies of B +>!> ignore some dependencies of B >!> >!> Taking solution: 2 >!> For problem: 0 diff --git a/solver/data.deptestomatic/solution-tests/uninstall-test.solution b/solver/data.deptestomatic/solution-tests/uninstall-test.solution index 806fe7a..057f23d 100644 --- a/solver/data.deptestomatic/solution-tests/uninstall-test.solution +++ b/solver/data.deptestomatic/solution-tests/uninstall-test.solution @@ -10,6 +10,6 @@ >!> keep foo-1.0-1.noarch >!> >!> Solution: ->!> Ignore some dependencies of foo2 +>!> ignore some dependencies of foo2 >!> >!> No valid solution found. -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

Jump to page: