December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11944 - /trunk/libzypp/CMakeLists.txt
by mlandres＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlandres Date: Wed Dec 17 14:07:21 2008 New Revision: 11944 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11944&view=rev Log: - Compile with -fPIC Modified: trunk/libzypp/CMakeLists.txt Modified: trunk/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/CMakeLists.txt?rev=11944… ============================================================================== --- trunk/libzypp/CMakeLists.txt (original) +++ trunk/libzypp/CMakeLists.txt Wed Dec 17 14:07:21 2008 @@ -20,8 +20,8 @@ MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual -Wnon-virtual-dtor" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -g -Wall -Woverloaded-virtual -Wnon-virtual-dtor" ) +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -g -Wall" ) set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11943 - /branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes
by mlandres＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlandres Date: Wed Dec 17 13:43:03 2008 New Revision: 11943 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11943&view=rev Log: add bnc# Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Dec 17 13:43:03 2008 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Wed Dec 17 13:11:48 CET 2008 - ma(a)suse.de -- Compile with -fPIC +- Compile with -fPIC (bnc #459675) - revision 11942 - 4.28.1 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11942 - in /branches/SuSE-Linux-11_0-Branch/libzypp: VERSION.cmake package/libzypp.changes
by mlandres＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlandres Date: Wed Dec 17 13:36:52 2008 New Revision: 11942 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11942&view=rev Log: changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Wed Dec 17 13:36:52 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "28") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Dec 17 13:36:52 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 17 13:11:48 CET 2008 - ma(a)suse.de + +- Compile with -fPIC +- revision 11942 +- 4.28.1 + +------------------------------------------------------------------- Wed Dec 10 10:43:29 CET 2008 - dmacvicar(a)suse.de - bump version due to new public method -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11941 - /branches/SuSE-Linux-11_0-Branch/libzypp/CMakeLists.txt
by mlandres＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlandres Date: Wed Dec 17 13:11:30 2008 New Revision: 11941 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11941&view=rev Log: link using -fPIC Modified: branches/SuSE-Linux-11_0-Branch/libzypp/CMakeLists.txt Modified: branches/SuSE-Linux-11_0-Branch/libzypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzyp… ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/CMakeLists.txt (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/CMakeLists.txt Wed Dec 17 13:11:30 2008 @@ -14,8 +14,8 @@ MATH( EXPR LIBZYPP_SO_FIRST "${LIBZYPP_CURRENT}-${LIBZYPP_AGE}" ) SET( VERSION "${LIBZYPP_MAJOR}.${LIBZYPP_MINOR}.${LIBZYPP_PATCH}" ) -SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -Woverloaded-virtual" ) -SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -Wall" ) +SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fPIC -Wall -Woverloaded-virtual" ) +SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fPIC -Wall" ) set( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS} -O3" ) set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3" ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11940 - /trunk/sat-solver/src/solverdebug.c
by mlschroe＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlschroe Date: Wed Dec 17 12:23:44 2008 New Revision: 11940 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11940&view=rev Log: - treat undecided packages as erase like libzypp does - fix erase debug message formatting Modified: trunk/sat-solver/src/solverdebug.c Modified: trunk/sat-solver/src/solverdebug.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solverdebug.c?rev… ============================================================================== --- trunk/sat-solver/src/solverdebug.c (original) +++ trunk/sat-solver/src/solverdebug.c Wed Dec 17 12:23:44 2008 @@ -273,11 +273,11 @@ { FOR_REPO_SOLVABLES(installed, p, s) { - if (solv->decisionmap[p] >= 0) + if (solv->decisionmap[p] > 0) continue; if (obsoletesmap[p]) continue; - POOL_DEBUG(SAT_DEBUG_RESULT, " erase %s\n", solvable2str(pool, s)); + POOL_DEBUG(SAT_DEBUG_RESULT, " erase %s\n", solvable2str(pool, s)); } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11939 - in /trunk/dialogsolver: VERSION.cmake package/libqdialogsolver1.changes
by schubi2＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: schubi2 Date: Wed Dec 17 12:11:55 2008 New Revision: 11939 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11939&view=rev Log: Revision 11938 Modified: trunk/dialogsolver/VERSION.cmake trunk/dialogsolver/package/libqdialogsolver1.changes Modified: trunk/dialogsolver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/VERSION.cmake?rev=1… ============================================================================== --- trunk/dialogsolver/VERSION.cmake (original) +++ trunk/dialogsolver/VERSION.cmake Wed Dec 17 12:11:55 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: trunk/dialogsolver/package/libqdialogsolver1.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/package/libqdialogs… ============================================================================== --- trunk/dialogsolver/package/libqdialogsolver1.changes (original) +++ trunk/dialogsolver/package/libqdialogsolver1.changes Wed Dec 17 12:11:55 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Dec 17 12:10:58 CET 2008 - schubi(a)suse.de + +- taking correct UTF8 code (bnc #458575) +- Revision 11938 +- version 1.2.6 + +------------------------------------------------------------------- Fri Nov 21 08:41:44 CET 2008 - schubi(a)suse.de - update translations -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11938 - /trunk/dialogsolver/src/getText.h
by schubi2＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: schubi2 Date: Wed Dec 17 12:10:14 2008 New Revision: 11938 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11938&view=rev Log: taking correct UTF8 code 458575 Modified: trunk/dialogsolver/src/getText.h Modified: trunk/dialogsolver/src/getText.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/getText.h?rev=1… ============================================================================== --- trunk/dialogsolver/src/getText.h (original) +++ trunk/dialogsolver/src/getText.h Wed Dec 17 12:10:14 2008 @@ -18,13 +18,13 @@ #define N_(MSG) QString(MSG) /** Return translated text. */ -#define _(MSG) QString(::dialogsolver::dgettext( MSG )) +#define _(MSG) QString::fromUtf8(::dialogsolver::dgettext( MSG )) /** Return translated text. */ -#define i18n(MSG) QString(::dialogsolver::dgettext( MSG )) +#define i18n(MSG) QString::fromUtf8(::dialogsolver::dgettext( MSG )) /** Return translated text (plural form). */ -#define _PL(MSG1,MSG2,N) QString(::dialogsolver::dngettext( MSG1; MSG2, N )) +#define _PL(MSG1,MSG2,N) QString::fromUtf8(::dialogsolver::dngettext( MSG1; MSG2, N )) /////////////////////////////////////////////////////////////////// namespace dialogsolver -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11937 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 17 Dec '08

17 Dec '08

Author: mlschroe Date: Wed Dec 17 11:18:21 2008 New Revision: 11937 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11937&view=rev Log: - fix second part of bnc#456756 Modified: trunk/sat-solver/src/solver.c Modified: trunk/sat-solver/src/solver.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/solver.c?rev=1193… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Wed Dec 17 11:18:21 2008 @@ -2597,7 +2597,7 @@ r = solv->rules + solv->updaterules + (i - solv->installed->start); if (!r->p) /* update rule == feature rule? */ r = r - solv->updaterules + solv->featurerules; - if (r->p && r->p != i) /* allowed to keep package? */ + if (r->p != i) /* allowed to keep package? */ continue; POOL_DEBUG(SAT_DEBUG_PROPAGATE, "keeping %s\n", solvable2str(pool, s)); @@ -2690,28 +2690,26 @@ { Rule *rr; s = pool->solvables + i; - - /* skip if not installed (can't update) */ if (s->repo != solv->installed) continue; - /* skip if already decided */ + + /* skip if already decided */ if (solv->decisionmap[i] > 0) continue; - /* noupdate is set if a job is erasing the installed solvable or installing a specific version */ + /* noupdate is set if a job is erasing the installed solvable or installing a specific version */ if (MAPTST(&solv->noupdate, i - solv->installed->start)) continue; - queue_empty(&dq); - rr = r; - if (rr->d < 0) /* disabled -> look at feature rule ? */ + if (rr->d < 0) /* disabled -> look at feature rule */ rr -= solv->installed->end - solv->installed->start; if (!rr->p) /* identical to update rule? */ rr = r; - if (rr->p <= 0) - continue; /* no such rule or disabled */ + if (!rr->p || rr->d < 0) + continue; /* no such rule (orpaned package) or disabled */ + queue_empty(&dq); FOR_RULELITERALS(p, dp, rr) { if (solv->decisionmap[p] > 0) @@ -2719,18 +2717,34 @@ if (solv->decisionmap[p] == 0) queue_push(&dq, p); } - if (p || !dq.count) /* already fulfilled or empty */ - continue; - olevel = level; - level = selectandinstall(solv, level, &dq, disablerules, rr - solv->rules); - if (level == 0) + if (!p && dq.count) /* neither fulfilled nor empty */ { - queue_free(&dq); - queue_free(&dqs); - return; + olevel = level; + level = selectandinstall(solv, level, &dq, disablerules, rr - solv->rules); + if (level == 0) + { + queue_free(&dq); + queue_free(&dqs); + return; + } + if (level <= olevel) + break; + } + /* if still undecided, keep it */ + if (solv->decisionmap[i] == 0) + { + olevel = level; + POOL_DEBUG(SAT_DEBUG_POLICY, "keeping %s\n", solvable2str(pool, pool->solvables + i)); + level = setpropagatelearn(solv, level, i, disablerules, r - solv->rules); + if (level == 0) + { + queue_free(&dq); + queue_free(&dqs); + return; + } + if (level <= olevel) + break; } - if (level <= olevel) - break; } systemlevel = level + 1; if (i < solv->installed->end) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11936 - in /trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper: install-zypper-force-test.solution install-zypper-noforce-test.solution
by mlschroe＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: mlschroe Date: Tue Dec 16 19:21:02 2008 New Revision: 11936 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11936&view=rev Log: - fix test cases now the vendor equivalence check works... Modified: trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-force-test.solution trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-noforce-test.solution Modified: trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-force-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/solver/data.lib… ============================================================================== --- trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-force-test.solution (original) +++ trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-force-test.solution Tue Dec 16 19:21:02 2008 @@ -1,74 +1,18 @@ >!> Installing zypper from channel zypp:svn >!> Solution #1: ->!> !unflag at76_usb-kmp-xen-0.17_2.6.25_rc9.17-2.i586[factory] ->!> !unflag aufs-kmp-debug-cvs20080324_2.6.25_rc9.17-10.i586[factory] >!> install bash-completion-20060301-71.noarch[factory] ->!> !unflag gimp-unstable-2.4.0rc3-0.pm.1.x86_64[packman] ->!> !unflag glibc-2.7-15.x86_64[system] >!> upgrade glibc-2.7-15.x86_64 => glibc-2.8-5.x86_64[factory] ->!> !unflag glibc-devel-2.7-14.x86_64[system] ->!> !unflag glibc-devel-2.8-5.i686[factory] >!> upgrade glibc-devel-2.7-14.x86_64 => glibc-devel-2.8-5.x86_64[factory] ->!> !unflag glibc-locale-2.7-14.x86_64[system] >!> upgrade glibc-locale-2.7-14.x86_64 => glibc-locale-2.8-5.x86_64[factory] ->!> !unflag gspcav-kmp-debug-01.00.20_2.6.25_rc9.16-2.x86_64[factory] ->!> !unflag gspcav-kmp-pae-01.00.20_2.6.25_rc9.17-2.i586[factory] ->!> !unflag kdeaddons3-kicker-3.5.9-3.x86_64[factory] ->!> !unflag kdeartwork3-kscreensaver-3.5.9-26.i586[factory] ->!> !unflag kdeartwork3-xscreensaver-3.5.9-26.i586[factory] ->!> !unflag kdebase3-3.5.9-36.i586[factory] ->!> !unflag kdebase3-kdm-3.5.9-36.i586[factory] ->!> !unflag kdebase3-ksysguardd-3.5.9-36.i586[factory] ->!> !unflag kdebase3-samba-3.5.9-36.i586[factory] ->!> !unflag kdegraphics3-kamera-3.5.9-30.i586[factory] ->!> !unflag kdegraphics3-kamera-3.5.9-29.x86_64[factory] ->!> !unflag kdegraphics3-pdf-3.5.9-29.x86_64[factory] ->!> !unflag kdegraphics3-scan-3.5.9-30.i586[factory] ->!> !unflag kdelibs3-arts-3.5.9-26.x86_64[factory] ->!> !unflag kdemultimedia3-3.5.9-23.x86_64[factory] ->!> !unflag kdemultimedia3-arts-3.5.7-61.pm.1.x86_64[packman] ->!> !unflag kdemultimedia3-mixer-3.5.9-24.i586[factory] ->!> !unflag kdemultimedia3-mixer-3.5.7-61.pm.1.x86_64[packman] ->!> !unflag kdenetwork3-InstantMessenger-3.5.9-24.x86_64[factory] ->!> !unflag kdenetwork3-news-3.5.9-24.x86_64[factory] ->!> !unflag kdeutils3-3.5.9-26.i586[factory] ->!> !unflag kernel-default-2.6.25-rc9.17.i586[factory] ->!> !unflag kernel-pae-2.6.25-rc9.17.i586[factory] ->!> !unflag kernel-xen-2.6.25-rc9.17.i586[factory] ->!> !unflag libkexiv2-0.1.6-0.pm.1.x86_64[packman] ->!> !unflag libsatsolver-devel-0.0.25-12.1.x86_64[system] ->!> !unflag libsatsolver-devel-0.0.28-3.1.i586[zypp:svn] >!> upgrade libsatsolver-devel-0.0.25-12.1.x86_64 => libsatsolver-devel-0.0.28-3.1.x86_64[zypp:svn] ->!> !unflag libzypp-4.13.2-2.x86_64[factory] ->!> !unflag libzypp-4.13.3-1.1.i586[zypp:svn] >!> upgrade libzypp-4.10.0-1.3.x86_64 => libzypp-4.13.3-1.1.x86_64[zypp:svn] >!> upgrade libzypp-devel-4.10.0-1.3.x86_64 => libzypp-devel-4.13.3-1.1.x86_64[zypp:svn] ->!> !unflag libzypp-testsuite-tools-4.2.2-16.i586[factory] >!> upgrade libzypp-testsuite-tools-4.2.2-13.4.x86_64 => libzypp-testsuite-tools-4.2.2-16.1.x86_64[zypp:svn] ->!> !unflag ndiswrapper-kmp-default-1.52_2.6.25_rc9.17-17.i586[factory] ->!> !unflag ndiswrapper-kmp-xen-1.52_2.6.25_rc9.17-17.i586[factory] ->!> !unflag novfs-kmp-debug-2.0.0_2.6.25_rc9.17-24.i586[factory] ->!> !unflag ntfsprogs-1.13.1-69.i586[factory] ->!> !unflag omnibook-kmp-debug-20080313_2.6.25_rc9.17-2.i586[factory] ->!> !unflag pcfclock-kmp-debug-0.44_2.6.25_rc9.17-194.i586[factory] ->!> !unflag perl-base-5.10.0-28.x86_64[factory] ->!> !unflag ruby-zypp-0.4.6-4.i586[factory] >!> upgrade ruby-zypp-0.4.6-12.12.x86_64 => ruby-zypp-0.4.6-15.5.x86_64[zypp:svn] ->!> !unflag satsolver-tools-0.0.25-12.1.x86_64[system] ->!> !unflag satsolver-tools-0.0.28-3.1.i586[zypp:svn] >!> upgrade satsolver-tools-0.0.25-12.1.x86_64 => satsolver-tools-0.0.28-3.1.x86_64[zypp:svn] ->!> !unflag tpctl-kmp-pae-4.17_2.6.25_rc9.17-177.i586[factory] ->!> !unflag uvcvideo-kmp-debug-r200_2.6.25_rc9.17-2.i586[factory] ->!> !unflag uvcvideo-kmp-pae-r200_2.6.25_rc9.17-2.i586[factory] ->!> !unflag virtualbox-ose-kmp-pae-1.5.6_2.6.25_rc9.17-11.i586[factory] ->!> !unflag wlan-ng-kmp-default-0.2.8_2.6.25_rc9.17-95.i586[factory] ->!> !unflag wlan-ng-kmp-xen-0.2.8_2.6.25_rc9.17-95.i586[factory] >!> upgrade yast2-ncurses-pkg-2.16.6-13.1.x86_64 => yast2-ncurses-pkg-2.16.6-24.1.x86_64[YaST_SVN] ->!> !unflag yast2-perl-bindings-2.16.5-12.13.x86_64[system] ->!> upgrade yast2-perl-bindings-2.16.5-12.13.x86_64 => yast2-perl-bindings-2.16.6-3.9.x86_64[YaST_SVN] +>!> upgrade yast2-perl-bindings-2.16.5-12.13.x86_64 => yast2-perl-bindings-2.16.6-4.x86_64[factory] >!> upgrade yast2-pkg-bindings-2.16.23-18.2.x86_64 => yast2-pkg-bindings-2.16.29-1.1.x86_64[YaST_SVN] >!> upgrade yast2-qt-pkg-2.16.32-1.3.x86_64 => yast2-qt-pkg-2.16.37-2.1.x86_64[YaST_SVN] ->!> !unflag zypper-0.11.0-5.i586[factory] ->!> !unflag zypper-0.11.0-3.x86_64[factory] >!> upgrade zypper-0.10.6-6.4.x86_64 => zypper-0.11.0-8.1.x86_64[zypp:svn] >!> installs=1, upgrades=14, uninstalls=0 Modified: trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-noforce-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/solver/data.lib… ============================================================================== --- trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-noforce-test.solution (original) +++ trunk/sat-solver/tests/solver/data.libzypp/sat-tests/install-zypper/install-zypper-noforce-test.solution Tue Dec 16 19:21:02 2008 @@ -1,74 +1,18 @@ >!> Installing zypper from channel zypp:svn >!> Solution #1: ->!> !unflag at76_usb-kmp-xen-0.17_2.6.25_rc9.17-2.i586[factory] ->!> !unflag aufs-kmp-debug-cvs20080324_2.6.25_rc9.17-10.i586[factory] >!> install bash-completion-20060301-71.noarch[factory] ->!> !unflag gimp-unstable-2.4.0rc3-0.pm.1.x86_64[packman] ->!> !unflag glibc-2.7-15.x86_64[system] >!> upgrade glibc-2.7-15.x86_64 => glibc-2.8-5.x86_64[factory] ->!> !unflag glibc-devel-2.7-14.x86_64[system] ->!> !unflag glibc-devel-2.8-5.i686[factory] >!> upgrade glibc-devel-2.7-14.x86_64 => glibc-devel-2.8-5.x86_64[factory] ->!> !unflag glibc-locale-2.7-14.x86_64[system] >!> upgrade glibc-locale-2.7-14.x86_64 => glibc-locale-2.8-5.x86_64[factory] ->!> !unflag gspcav-kmp-debug-01.00.20_2.6.25_rc9.16-2.x86_64[factory] ->!> !unflag gspcav-kmp-pae-01.00.20_2.6.25_rc9.17-2.i586[factory] ->!> !unflag kdeaddons3-kicker-3.5.9-3.x86_64[factory] ->!> !unflag kdeartwork3-kscreensaver-3.5.9-26.i586[factory] ->!> !unflag kdeartwork3-xscreensaver-3.5.9-26.i586[factory] ->!> !unflag kdebase3-3.5.9-36.i586[factory] ->!> !unflag kdebase3-kdm-3.5.9-36.i586[factory] ->!> !unflag kdebase3-ksysguardd-3.5.9-36.i586[factory] ->!> !unflag kdebase3-samba-3.5.9-36.i586[factory] ->!> !unflag kdegraphics3-kamera-3.5.9-30.i586[factory] ->!> !unflag kdegraphics3-kamera-3.5.9-29.x86_64[factory] ->!> !unflag kdegraphics3-pdf-3.5.9-29.x86_64[factory] ->!> !unflag kdegraphics3-scan-3.5.9-30.i586[factory] ->!> !unflag kdelibs3-arts-3.5.9-26.x86_64[factory] ->!> !unflag kdemultimedia3-3.5.9-23.x86_64[factory] ->!> !unflag kdemultimedia3-arts-3.5.7-61.pm.1.x86_64[packman] ->!> !unflag kdemultimedia3-mixer-3.5.9-24.i586[factory] ->!> !unflag kdemultimedia3-mixer-3.5.7-61.pm.1.x86_64[packman] ->!> !unflag kdenetwork3-InstantMessenger-3.5.9-24.x86_64[factory] ->!> !unflag kdenetwork3-news-3.5.9-24.x86_64[factory] ->!> !unflag kdeutils3-3.5.9-26.i586[factory] ->!> !unflag kernel-default-2.6.25-rc9.17.i586[factory] ->!> !unflag kernel-pae-2.6.25-rc9.17.i586[factory] ->!> !unflag kernel-xen-2.6.25-rc9.17.i586[factory] ->!> !unflag libkexiv2-0.1.6-0.pm.1.x86_64[packman] ->!> !unflag libsatsolver-devel-0.0.25-12.1.x86_64[system] ->!> !unflag libsatsolver-devel-0.0.28-3.1.i586[zypp:svn] >!> upgrade libsatsolver-devel-0.0.25-12.1.x86_64 => libsatsolver-devel-0.0.28-3.1.x86_64[zypp:svn] ->!> !unflag libzypp-4.13.2-2.x86_64[factory] ->!> !unflag libzypp-4.13.3-1.1.i586[zypp:svn] >!> upgrade libzypp-4.10.0-1.3.x86_64 => libzypp-4.13.3-1.1.x86_64[zypp:svn] >!> upgrade libzypp-devel-4.10.0-1.3.x86_64 => libzypp-devel-4.13.3-1.1.x86_64[zypp:svn] ->!> !unflag libzypp-testsuite-tools-4.2.2-16.i586[factory] >!> upgrade libzypp-testsuite-tools-4.2.2-13.4.x86_64 => libzypp-testsuite-tools-4.2.2-16.1.x86_64[zypp:svn] ->!> !unflag ndiswrapper-kmp-default-1.52_2.6.25_rc9.17-17.i586[factory] ->!> !unflag ndiswrapper-kmp-xen-1.52_2.6.25_rc9.17-17.i586[factory] ->!> !unflag novfs-kmp-debug-2.0.0_2.6.25_rc9.17-24.i586[factory] ->!> !unflag ntfsprogs-1.13.1-69.i586[factory] ->!> !unflag omnibook-kmp-debug-20080313_2.6.25_rc9.17-2.i586[factory] ->!> !unflag pcfclock-kmp-debug-0.44_2.6.25_rc9.17-194.i586[factory] ->!> !unflag perl-base-5.10.0-28.x86_64[factory] ->!> !unflag ruby-zypp-0.4.6-4.i586[factory] >!> upgrade ruby-zypp-0.4.6-12.12.x86_64 => ruby-zypp-0.4.6-15.5.x86_64[zypp:svn] ->!> !unflag satsolver-tools-0.0.25-12.1.x86_64[system] ->!> !unflag satsolver-tools-0.0.28-3.1.i586[zypp:svn] >!> upgrade satsolver-tools-0.0.25-12.1.x86_64 => satsolver-tools-0.0.28-3.1.x86_64[zypp:svn] ->!> !unflag tpctl-kmp-pae-4.17_2.6.25_rc9.17-177.i586[factory] ->!> !unflag uvcvideo-kmp-debug-r200_2.6.25_rc9.17-2.i586[factory] ->!> !unflag uvcvideo-kmp-pae-r200_2.6.25_rc9.17-2.i586[factory] ->!> !unflag virtualbox-ose-kmp-pae-1.5.6_2.6.25_rc9.17-11.i586[factory] ->!> !unflag wlan-ng-kmp-default-0.2.8_2.6.25_rc9.17-95.i586[factory] ->!> !unflag wlan-ng-kmp-xen-0.2.8_2.6.25_rc9.17-95.i586[factory] >!> upgrade yast2-ncurses-pkg-2.16.6-13.1.x86_64 => yast2-ncurses-pkg-2.16.6-24.1.x86_64[YaST_SVN] ->!> !unflag yast2-perl-bindings-2.16.5-12.13.x86_64[system] ->!> upgrade yast2-perl-bindings-2.16.5-12.13.x86_64 => yast2-perl-bindings-2.16.6-3.9.x86_64[YaST_SVN] +>!> upgrade yast2-perl-bindings-2.16.5-12.13.x86_64 => yast2-perl-bindings-2.16.6-4.x86_64[factory] >!> upgrade yast2-pkg-bindings-2.16.23-18.2.x86_64 => yast2-pkg-bindings-2.16.29-1.1.x86_64[YaST_SVN] >!> upgrade yast2-qt-pkg-2.16.32-1.3.x86_64 => yast2-qt-pkg-2.16.37-2.1.x86_64[YaST_SVN] ->!> !unflag zypper-0.11.0-5.i586[factory] ->!> !unflag zypper-0.11.0-3.x86_64[factory] >!> upgrade zypper-0.10.6-6.4.x86_64 => zypper-0.11.0-8.1.x86_64[zypp:svn] >!> installs=1, upgrades=14, uninstalls=0 -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r11935 - /trunk/sat-solver/src/policy.c
by mlschroe＠svn.opensuse.org 16 Dec '08

16 Dec '08

Author: mlschroe Date: Tue Dec 16 19:19:51 2008 New Revision: 11935 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11935&view=rev Log: - oops, good thing the vendorcheck isn't used in real life yet Modified: trunk/sat-solver/src/policy.c Modified: trunk/sat-solver/src/policy.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=1193… ============================================================================== --- trunk/sat-solver/src/policy.c (original) +++ trunk/sat-solver/src/policy.c Tue Dec 16 19:19:51 2008 @@ -430,7 +430,7 @@ if (!vendormask1) return 0; vendormask2 = pool_vendor2mask(pool, s2->vendor); - if ((vendormask1 & vendormask2) == 0) + if ((vendormask1 & vendormask2) != 0) return 0; return 1; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0