Mailinglist Archive: zypp-commit (545 mails)

< Previous Next >
[zypp-commit] r8518 - in /trunk/sat-solver: bindings/ src/ testsuite/ testsuite/data.libzypp/bugzilla-tests/
  • From: schubi2@xxxxxxxxxxxxxxxx
  • Date: Thu, 07 Feb 2008 09:20:01 -0000
  • Message-id: <20080207092001.C55B52487C@xxxxxxxxxxxxxxxx>
Author: schubi2
Date: Thu Feb 7 10:20:01 2008
New Revision: 8518

URL: http://svn.opensuse.org/viewcvs/zypp?rev=8518&view=rev
Log:
cleanup

Modified:
trunk/sat-solver/bindings/satsolver.i
trunk/sat-solver/src/policy.c
trunk/sat-solver/src/policy.h

trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution1

trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution2

trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-test.solution
trunk/sat-solver/testsuite/yps.c

Modified: trunk/sat-solver/bindings/satsolver.i
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
--- trunk/sat-solver/bindings/satsolver.i (original)
+++ trunk/sat-solver/bindings/satsolver.i Thu Feb 7 10:20:01 2008
@@ -422,7 +422,7 @@
queue_push(&plist, i);
}

- prune_best_version_arch(NULL, pool, &plist);
+ prune_best_arch_name_version(NULL, pool, &plist);
if (plist.count == 0) {
return NULL;
}

Modified: trunk/sat-solver/src/policy.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.c?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
--- trunk/sat-solver/src/policy.c (original)
+++ trunk/sat-solver/src/policy.c Thu Feb 7 10:20:01 2008
@@ -170,7 +170,7 @@
plist->count = j;
}

-static void
+void
prune_to_best_arch(Pool *pool, Queue *plist)
{
Id a, bestscore;
@@ -212,7 +212,7 @@
*
*/

-static void
+void
prune_to_best_version(Solver *solv, Queue *plist)
{
Pool *pool = solv->pool;
@@ -296,9 +296,8 @@
plist->count = j;
}

-/* legacy, do not use anymore! */
void
-prune_best_version_arch(Solver *solv, Pool *pool, Queue *plist)
+prune_best_arch_name_version(Solver *solv, Pool *pool, Queue *plist)
{
if (solv && solv->bestSolvableCb)
{ /* The application is responsible for */
@@ -324,7 +323,7 @@
if (inst)
queue_push(plist, inst);

- prune_best_version_arch (solv, pool, plist);
+ prune_best_arch_name_version (solv, pool, plist);
}



Modified: trunk/sat-solver/src/policy.h
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/policy.h?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
--- trunk/sat-solver/src/policy.h (original)
+++ trunk/sat-solver/src/policy.h Thu Feb 7 10:20:01 2008
@@ -7,7 +7,7 @@

/*
* Generic policy interface for SAT solver
- *
+ * The policy* function can be "overloaded" by defining a callback in the
solver struct.
*/

#include "solver.h"
@@ -16,10 +16,46 @@
#define POLICY_MODE_RECOMMEND 1
#define POLICY_MODE_SUGGEST 2

-extern void prune_best_version_arch(Solver *solv, Pool *pool, Queue *plist);
-
+/* This functions can be used for sorting solvables to a specific order like
architecture, version. */
+/* Solvables which does not fit to the system will be deleted from the list.
*/
+extern void prune_best_arch_name_version(Solver *solv, Pool *pool, Queue
*plist);
+extern void prune_to_best_arch(Pool *pool, Queue *plist);
+extern void prune_to_best_version(Solver *solv, Queue *plist);
+
+
+/* The following default policies can be overloaded by the application by
using callbacks which are
+ * descibed in solver.h:
+ *
+ * Finding best candidate
+ *
+ * Callback definition:
+ * void bestSolvable (Pool *pool, Queue *canditates)
+ * candidates : List of canditates which has to be sorted by the
function call
+ * return candidates: Sorted list of the candidates(first is the best).
+ *
+ * Checking if two solvables has compatible architectures
+ *
+ * Callback definition:
+ * int archCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2);
+ *
+ * return 0 it the two solvables has compatible architectures
+ *
+ * Checking if two solvables has compatible vendors
+ *
+ * Callback definition:
+ * int vendorCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2);
+ *
+ * return 0 it the two solvables has compatible architectures
+ *
+ * Evaluate update candidate
+ *
+ * Callback definition:
+ * void pdateCandidateCb (Pool *pool, Solvable *solvable, Queue *canditates)
+ * solvable : for which updates should be search
+ * candidates : List of candidates (This list depends on other
+ * restrictions like architecture and vendor policies too)
+ */
extern void policy_filter_unwanted(Solver *solv, Queue *plist, Id inst, int
mode);
-
extern int policy_illegal_archchange(Solver *solv, Solvable *s1, Solvable
*s2);
extern int policy_illegal_vendorchange(Solver *solv, Solvable *s1, Solvable
*s2);
extern void policy_findupdatepackages(Solver *solv,

Modified:
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution1
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution1?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
---
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution1
(original)
+++
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution1
Thu Feb 7 10:20:01 2008
@@ -290,7 +290,6 @@
!> install krb5-1.4.3-19.11.i586[1]
!> install ksh-93r-12.22.i586[1]
!> install ksymoops-2.4.11-17.4.i586[1]
->!> install language:en-.noarch
!> install latex2html-pngicons-2002.2.1-379.4.noarch[1]
!> install ldapcpplib-0.0.4-14.8.i586[1]
!> install less-394-14.4.i586[1]

Modified:
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution2
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution2?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
---
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution2
(original)
+++
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-test.solution2
Thu Feb 7 10:20:01 2008
@@ -291,7 +291,6 @@
!> install krb5-1.4.3-19.11.i586[1]
!> install ksh-93r-12.22.i586[1]
!> install ksymoops-2.4.11-17.4.i586[1]
->!> install language:en-.noarch
!> install latex2html-pngicons-2002.2.1-379.4.noarch[1]
!> install ldapcpplib-0.0.4-14.8.i586[1]
!> install less-394-14.4.i586[1]

Modified:
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-test.solution
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-test.solution?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
---
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-test.solution
(original)
+++
trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug310618-test.solution
Thu Feb 7 10:20:01 2008
@@ -1,792 +1,3 @@
->!> Installing language:en from channel locales
->!> Installing language:en_US from channel locales
->!> Installing RealPlayer from channel 1
->!> Installing compat from channel 1
->!> Installing flash-player from channel 1
->!> Installing kdebase3-nsplugin from channel 1
->!> Installing master-boot-code from channel 1
->!> Installing smartlink-softmodem from channel 1
->!> Installing AdobeICCProfiles from channel 1
->!> Installing Crystalcursors from channel 1
->!> Installing OpenOffice_org-templates-en from channel 1
->!> Installing OpenOffice_org-templates-presentation-layouts from channel 1
->!> Installing SuSEfirewall2 from channel 1
->!> Installing agfa-fonts from channel 1
->!> Installing autoyast2 from channel 1
->!> Installing atmel-firmware from channel 1
->!> Installing autoyast2-installation from channel 1
->!> Installing dejavu from channel 1
->!> Installing desktop-data-SuSE from channel 1
->!> Installing desktop-translations from channel 1
->!> Installing efont-unicode from channel 1
->!> Installing fonts-config from channel 1
->!> Installing gimp-help from channel 1
->!> Installing gnome-icon-theme from channel 1
->!> Installing ifnteuro from channel 1
->!> Installing inst-source-utils from channel 1
->!> Installing info2html from channel 1
->!> Installing intlfnts from channel 1
->!> Installing ipw-firmware from channel 1
->!> Installing jarnal from channel 1
->!> Installing man-pages from channel 1
->!> Installing manufacturer-PPDs from channel 1
->!> Installing myspell-american from channel 1
->!> Installing netcfg from channel 1
->!> Installing opensuse-manual_en from channel 1
->!> Installing pciutils-ids from channel 1
->!> Installing providers from channel 1
->!> Installing qlogic-firmware from channel 1
->!> Installing release-notes from channel 1
->!> Installing siga from channel 1
->!> Installing sgml-skel from channel 1
->!> Installing suse-build-key from channel 1
->!> Installing suseRegister from channel 1
->!> Installing susehelp from channel 1
->!> Installing susehelp_en from channel 1
->!> Installing ulimit from channel 1
->!> Installing update-alternatives from channel 1
->!> Installing words from channel 1
->!> Installing xdg-utils from channel 1
->!> Installing xkeyboard-config from channel 1
->!> Installing xorg-x11-fonts from channel 1
->!> Installing xorg-x11-fonts-core from channel 1
->!> Installing yast2-backup from channel 1
->!> Installing yast2-bluetooth from channel 1
->!> Installing yast2-firewall from channel 1
->!> Installing yast2-inetd from channel 1
->!> Installing yast2-irda from channel 1
->!> Installing yast2-installation from channel 1
->!> Installing yast2-mail from channel 1
->!> Installing yast2-iscsi-client from channel 1
->!> Installing yast2-kerberos-client from channel 1
->!> Installing yast2-ldap-client from channel 1
->!> Installing yast2-nfs-client from channel 1
->!> Installing yast2-online-update from channel 1
->!> Installing yast2-ntp-client from channel 1
->!> Installing yast2-pam from channel 1
->!> Installing yast2-online-update-frontend from channel 1
->!> Installing yast2-registration from channel 1
->!> Installing yast2-repair from channel 1
->!> Installing yast2-restore from channel 1
->!> Installing yast2-runlevel from channel 1
->!> Installing yast2-samba-client from channel 1
->!> Installing yast2-samba-server from channel 1
->!> Installing yast2-scanner from channel 1
->!> Installing yast2-schema from channel 1
->!> Installing yast2-security from channel 1
->!> Installing yast2-sudo from channel 1
->!> Installing yast2-support from channel 1
->!> Installing yast2-sysconfig from channel 1
->!> Installing yast2-theme-openSUSE from channel 1
->!> Installing yast2-trans-en_US from channel 1
->!> Installing yast2-trans-stats from channel 1
->!> Installing 3ddiag from channel 1
->!> Installing yast2-tv from channel 1
->!> Installing yast2-x11 from channel 1
->!> Installing CheckHardware from channel 1
->!> Installing 915resolution from channel 1
->!> Installing ImageMagick from channel 1
->!> Installing GraphicsMagick from channel 1
->!> Installing Mesa from channel 1
->!> Installing Mesa-32bit from channel 1
->!> Installing MozillaFirefox from channel 1
->!> Installing MozillaFirefox-translations from channel 1
->!> Installing NetworkManager from channel 1
->!> Installing NetworkManager-kde from channel 1
->!> Installing OpenEXR from channel 1
->!> Installing OpenOffice_org-Quickstarter from channel 1
->!> Installing OpenEXR-32bit from channel 1
->!> Installing OpenOffice_org-kde from channel 1
->!> Installing OpenOffice_org from channel 1
->!> Installing aaa_base from channel 1
->!> Installing PolicyKit from channel 1
->!> Installing SDL from channel 1
->!> Installing a2ps from channel 1
->!> Installing aaa_skel from channel 1
->!> Installing aalib from channel 1
->!> Installing acl from channel 1
->!> Installing acpid from channel 1
->!> Installing alsa from channel 1
->!> Installing amarok from channel 1
->!> Installing amarok-libvisual from channel 1
->!> Installing amarok-xine from channel 1
->!> Installing arts from channel 1
->!> Installing aspell from channel 1
->!> Installing ash from channel 1
->!> Installing aspell-32bit from channel 1
->!> Installing aspell-en from channel 1
->!> Installing at from channel 1
->!> Installing atk from channel 1
->!> Installing atk-32bit from channel 1
->!> Installing attr from channel 1
->!> Installing audiofile from channel 1
->!> Installing audit-libs from channel 1
->!> Installing autofs from channel 1
->!> Installing avahi-compat-mDNSResponder from channel 1
->!> Installing bash from channel 1
->!> Installing beagle from channel 1
->!> Installing bc from channel 1
->!> Installing beagle-firefox from channel 1
->!> Installing beagle-index from channel 1
->!> Installing bind-utils from channel 1
->!> Installing bind-libs from channel 1
->!> Installing binutils from channel 1
->!> Installing blocxx from channel 1
->!> Installing bluez-libs from channel 1
->!> Installing bluez-utils from channel 1
->!> Installing boost from channel 1
->!> Installing bootsplash from channel 1
->!> Installing bootcycle from channel 1
->!> Installing bootsplash-theme-SuSE from channel 1
->!> Installing cairo from channel 1
->!> Installing bzip2 from channel 1
->!> Installing cabextract from channel 1
->!> Installing cairo-32bit from channel 1
->!> Installing cdparanoia from channel 1
->!> Installing cdrdao from channel 1
->!> Installing cdrkit-cdrtools-compat from channel 1
->!> Installing classpath from channel 1
->!> Installing compat-libstdc++ from channel 1
->!> Installing compat-openssl097g from channel 1
->!> Installing cpp from channel 1
->!> Installing cpio from channel 1
->!> Installing coreutils from channel 1
->!> Installing cpufrequtils from channel 1
->!> Installing cracklib from channel 1
->!> Installing cron from channel 1
->!> Installing cups from channel 1
->!> Installing cups-client from channel 1
->!> Installing cups-drivers from channel 1
->!> Installing cups-libs from channel 1
->!> Installing curl from channel 1
->!> Installing cups-libs-32bit from channel 1
->!> Installing cyrus-sasl-32bit from channel 1
->!> Installing cyrus-sasl from channel 1
->!> Installing cyrus-sasl-digestmd5 from channel 1
->!> Installing cyrus-sasl-crammd5 from channel 1
->!> Installing cyrus-sasl-saslauthd from channel 1
->!> Installing cyrus-sasl-plain from channel 1
->!> Installing db-utils from channel 1
->!> Installing dbus-1 from channel 1
->!> Installing dbus-1-32bit from channel 1
->!> Installing dbus-1-glib from channel 1
->!> Installing dbus-1-glib-32bit from channel 1
->!> Installing dbus-1-qt3 from channel 1
->!> Installing dbus-1-x11 from channel 1
->!> Installing dcraw from channel 1
->!> Installing deltarpm from channel 1
->!> Installing desktop-file-utils from channel 1
->!> Installing device-mapper from channel 1
->!> Installing dhcdbd from channel 1
->!> Installing dhcp from channel 1
->!> Installing dhcp-client from channel 1
->!> Installing dhcpcd from channel 1
->!> Installing dialog from channel 1
->!> Installing diffutils from channel 1
->!> Installing digikam from channel 1
->!> Installing digikamimageplugins from channel 1
->!> Installing dirmngr from channel 1
->!> Installing dmraid from channel 1
->!> Installing dockutils from channel 1
->!> Installing dos2unix from channel 1
->!> Installing dosfstools from channel 1
->!> Installing dvd+rw-tools from channel 1
->!> Installing e2fsprogs from channel 1
->!> Installing ed from channel 1
->!> Installing eject from channel 1
->!> Installing enscript from channel 1
->!> Installing esound from channel 1
->!> Installing ethtool from channel 1
->!> Installing evms from channel 1
->!> Installing evms-gui from channel 1
->!> Installing exiftool from channel 1
->!> Installing expat from channel 1
->!> Installing fam from channel 1
->!> Installing fam-32bit from channel 1
->!> Installing fftw3 from channel 1
->!> Installing fbset from channel 1
->!> Installing file from channel 1
->!> Installing fileshareset from channel 1
->!> Installing fillup from channel 1
->!> Installing filesystem from channel 1
->!> Installing findutils from channel 1
->!> Installing flac from channel 1
->!> Installing fontconfig from channel 1
->!> Installing fontconfig-32bit from channel 1
->!> Installing foomatic-filters from channel 1
->!> Installing freeglut from channel 1
->!> Installing freetype from channel 1
->!> Installing freetype2 from channel 1
->!> Installing freetype2-32bit from channel 1
->!> Installing fribidi from channel 1
->!> Installing ftgl from channel 1
->!> Installing ft2demos from channel 1
->!> Installing fvwm2 from channel 1
->!> Installing gail from channel 1
->!> Installing gawk from channel 1
->!> Installing gcc-gij from channel 1
->!> Installing gdbm from channel 1
->!> Installing gconf2-32bit from channel 1
->!> Installing gconf2 from channel 1
->!> Installing gdb from channel 1
->!> Installing gdbm-32bit from channel 1
->!> Installing gettext from channel 1
->!> Installing giflib from channel 1
->!> Installing ghostscript-fonts-other from channel 1
->!> Installing ghostscript-library from channel 1
->!> Installing ghostscript-x11 from channel 1
->!> Installing ghostscript-fonts-std from channel 1
->!> Installing gimp from channel 1
->!> Installing gle from channel 1
->!> Installing glib from channel 1
->!> Installing glib2 from channel 1
->!> Installing glib-sharp2 from channel 1
->!> Installing glib2-32bit from channel 1
->!> Installing glibc from channel 1
->!> Installing glitz from channel 1
->!> Installing glibc-32bit from channel 1
->!> Installing glibc-i18ndata from channel 1
->!> Installing glibc-locale from channel 1
->!> Installing glitz-32bit from channel 1
->!> Installing gmime from channel 1
->!> Installing glibc-locale-32bit from channel 1
->!> Installing gmp from channel 1
->!> Installing gnokii from channel 1
->!> Installing gnome-keyring from channel 1
->!> Installing gnome-vfs2-32bit from channel 1
->!> Installing gnome-vfs2 from channel 1
->!> Installing gnutls from channel 1
->!> Installing gpart from channel 1
->!> Installing gpg2 from channel 1
->!> Installing gpgme from channel 1
->!> Installing gpm from channel 1
->!> Installing grep from channel 1
->!> Installing groff from channel 1
->!> Installing grub from channel 1
->!> Installing gsf-sharp from channel 1
->!> Installing gtk from channel 1
->!> Installing gtk-sharp2 from channel 1
->!> Installing gtk2-engines-32bit from channel 1
->!> Installing gtk2-32bit from channel 1
->!> Installing gtk2 from channel 1
->!> Installing gtksourceview from channel 1
->!> Installing ispell-american from channel 1
->!> Installing gutenprint from channel 1
->!> Installing gwenview from channel 1
->!> Installing gzip from channel 1
->!> Installing hal from channel 1
->!> Installing hal-resmgr from channel 1
->!> Installing hdparm from channel 1
->!> Installing hfsutils from channel 1
->!> Installing hplip from channel 1
->!> Installing hotkey-setup from channel 1
->!> Installing hplip-hpijs from channel 1
->!> Installing hwinfo from channel 1
->!> Installing htdig from channel 1
->!> Installing imlib from channel 1
->!> Installing id3lib from channel 1
->!> Installing ifplugd from channel 1
->!> Installing imlib2-loaders from channel 1
->!> Installing imlib2 from channel 1
->!> Installing info from channel 1
->!> Installing initviocons from channel 1
->!> Installing insserv from channel 1
->!> Installing iproute2 from channel 1
->!> Installing iptables from channel 1
->!> Installing iputils from channel 1
->!> Installing ipw3945d from channel 1
->!> Installing irda from channel 1
->!> Installing irqbalance from channel 1
->!> Installing ispell from channel 1
->!> Installing jack from channel 1
->!> Installing jpeg from channel 1
->!> Installing java-1_5_0-sun from channel 1
->!> Installing joe from channel 1
->!> Installing jfsutils from channel 1
->!> Installing jpackage-utils from channel 1
->!> Installing k3b from channel 1
->!> Installing kaffeine from channel 1
->!> Installing kbd from channel 1
->!> Installing kcm_gtk from channel 1
->!> Installing kdeaddons3-kicker from channel 1
->!> Installing kdeaddons3-konqueror from channel 1
->!> Installing kdebase3 from channel 1
->!> Installing kdeartwork3-kscreensaver from channel 1
->!> Installing kdeartwork3-xscreensaver from channel 1
->!> Installing kdebase3-SuSE from channel 1
->!> Installing kdebase3-beagle from channel 1
->!> Installing kdebase3-kdm from channel 1
->!> Installing kdebase3-ksysguardd from channel 1
->!> Installing kdebase3-samba from channel 1
->!> Installing kdebase3-session from channel 1
->!> Installing kdebluetooth from channel 1
->!> Installing kdegraphics3 from channel 1
->!> Installing kdegraphics3-pdf from channel 1
->!> Installing kdegraphics3-kamera from channel 1
->!> Installing kdegraphics3-postscript from channel 1
->!> Installing kdelibs3 from channel 1
->!> Installing kdegraphics3-scan from channel 1
->!> Installing kdenetwork3-InstantMessenger from channel 1
->!> Installing kdelibs3-32bit from channel 1
->!> Installing kdenetwork3 from channel 1
->!> Installing kdelibs3-doc from channel 1
->!> Installing kdemultimedia3 from channel 1
->!> Installing kdemultimedia3-CD from channel 1
->!> Installing kdemultimedia3-mixer from channel 1
->!> Installing kdenetwork3-news from channel 1
->!> Installing kdenetwork3-vnc from channel 1
->!> Installing kdepim3 from channel 1
->!> Installing kdepim3-notes from channel 1
->!> Installing kdepim3-kpilot from channel 1
->!> Installing kdeutils3-laptop from channel 1
->!> Installing kdeutils3 from channel 1
->!> Installing kdetv from channel 1
->!> Installing kernel-default from channel 1
->!> Installing kio_ipodslave from channel 1
->!> Installing kerry from channel 1
->!> Installing kio_beagle from channel 1
->!> Installing kio_slp from channel 1
->!> Installing kio_iso from channel 1
->!> Installing kipi-plugins from channel 1
->!> Installing kitchensync from channel 1
->!> Installing klogd from channel 1
->!> Installing koffice from channel 1
->!> Installing koffice-illustration from channel 1
->!> Installing konversation from channel 1
->!> Installing kpowersave from channel 1
->!> Installing krb5-32bit from channel 1
->!> Installing krb5 from channel 1
->!> Installing ksh from channel 1
->!> Installing krecord from channel 1
->!> Installing kscpm from channel 1
->!> Installing ktorrent from channel 1
->!> Installing ksymoops from channel 1
->!> Installing kwin-decor-suse2 from channel 1
->!> Installing ldapcpplib from channel 1
->!> Installing less from channel 1
->!> Installing libMagick++10 from channel 1
->!> Installing libacl from channel 1
->!> Installing libacl-32bit from channel 1
->!> Installing libakode from channel 1
->!> Installing libao from channel 1
->!> Installing libart_lgpl from channel 1
->!> Installing libart_lgpl-32bit from channel 1
->!> Installing libattr from channel 1
->!> Installing libasound2-32bit from channel 1
->!> Installing libattr-32bit from channel 1
->!> Installing libbeagle from channel 1
->!> Installing libbonobo from channel 1
->!> Installing libbonoboui from channel 1
->!> Installing libcom_err2 from channel 1
->!> Installing libcroco from channel 1
->!> Installing libcroco-32bit from channel 1
->!> Installing libdb-4_5 from channel 1
->!> Installing libdrm from channel 1
->!> Installing libdrm-32bit from channel 1
->!> Installing libexif from channel 1
->!> Installing libevent from channel 1
->!> Installing libgcc42 from channel 1
->!> Installing libgcc42-32bit from channel 1
->!> Installing libgcrypt-32bit from channel 1
->!> Installing libgcrypt from channel 1
->!> Installing libglade2 from channel 1
->!> Installing libgimpprint from channel 1
->!> Installing libgnome from channel 1
->!> Installing libgnomecups from channel 1
->!> Installing libgnomecanvas from channel 1
->!> Installing libgnomeprint from channel 1
->!> Installing libgnomeprintui from channel 1
->!> Installing libgnomesu from channel 1
->!> Installing libgnomeui from channel 1
->!> Installing libgpg-error from channel 1
->!> Installing libgpg-error-32bit from channel 1
->!> Installing libgphoto2 from channel 1
->!> Installing libgsf from channel 1
->!> Installing libgpod2 from channel 1
->!> Installing libgsf-32bit from channel 1
->!> Installing libgsf-gnome from channel 1
->!> Installing libgssapi from channel 1
->!> Installing libgtkhtml from channel 1
->!> Installing libical from channel 1
->!> Installing libicu from channel 1
->!> Installing libidl from channel 1
->!> Installing libidn from channel 1
->!> Installing libidl-32bit from channel 1
->!> Installing libidn-32bit from channel 1
->!> Installing libieee1284 from channel 1
->!> Installing libjpeg-32bit from channel 1
->!> Installing libjasper from channel 1
->!> Installing libjasper-32bit from channel 1
->!> Installing libjpeg from channel 1
->!> Installing libmng-32bit from channel 1
->!> Installing liblcms from channel 1
->!> Installing libkipi from channel 1
->!> Installing liblazy from channel 1
->!> Installing libksba from channel 1
->!> Installing liblcms-32bit from channel 1
->!> Installing libltdl-3 from channel 1
->!> Installing libmal from channel 1
->!> Installing libmng from channel 1
->!> Installing libmpcdec5 from channel 1
->!> Installing libmtp from channel 1
->!> Installing libmusicbrainz4 from channel 1
->!> Installing libnscd from channel 1
->!> Installing libnjb from channel 1
->!> Installing libnetpbm10 from channel 1
->!> Installing libnl from channel 1
->!> Installing libnscd-32bit from channel 1
->!> Installing libofa from channel 1
->!> Installing libogg from channel 1
->!> Installing libopencdk from channel 1
->!> Installing libopensync from channel 1
->!> Installing libopensync-plugin-file from channel 1
->!> Installing libopensync-plugin-gnokii from channel 1
->!> Installing libopensync-plugin-gpe from channel 1
->!> Installing libopensync-plugin-irmc from channel 1
->!> Installing libopensync-plugin-kdepim from channel 1
->!> Installing libopensync-plugin-palm from channel 1
->!> Installing libopensync-plugin-opie from channel 1
->!> Installing libopensync-plugin-syncml from channel 1
->!> Installing libopensync-tools from channel 1
->!> Installing libopensync-plugin-sunbird from channel 1
->!> Installing libpcap from channel 1
->!> Installing libpng from channel 1
->!> Installing libpng-32bit from channel 1
->!> Installing libqt4-sql from channel 1
->!> Installing libqt4-x11 from channel 1
->!> Installing libqt4-dbus-1 from channel 1
->!> Installing libqt4 from channel 1
->!> Installing libqt4-qt3support from channel 1
->!> Installing libqtpod from channel 1
->!> Installing libreadline5 from channel 1
->!> Installing librsvg from channel 1
->!> Installing librpcsecgss from channel 1
->!> Installing librsvg-32bit from channel 1
->!> Installing libsamplerate from channel 1
->!> Installing libsmbclient from channel 1
->!> Installing libsmbclient-32bit from channel 1
->!> Installing libsndfile from channel 1
->!> Installing libsoup from channel 1
->!> Installing libstdc++42-32bit from channel 1
->!> Installing libstdc++42 from channel 1
->!> Installing libstroke from channel 1
->!> Installing libsyncml0 from channel 1
->!> Installing libtheora0 from channel 1
->!> Installing libusb from channel 1
->!> Installing libtiff3 from channel 1
->!> Installing libtunepimp from channel 1
->!> Installing libvolume_id from channel 1
->!> Installing libvisual from channel 1
->!> Installing libvorbis from channel 1
->!> Installing libwmf from channel 1
->!> Installing libxcrypt from channel 1
->!> Installing libxml2 from channel 1
->!> Installing libxslt from channel 1
->!> Installing libxml2-32bit from channel 1
->!> Installing libxslt-32bit from channel 1
->!> Installing liby2util from channel 1
->!> Installing libzio from channel 1
->!> Installing libzypp from channel 1
->!> Installing limal from channel 1
->!> Installing limal-perl from channel 1
->!> Installing lsof from channel 1
->!> Installing linux32 from channel 1
->!> Installing logrotate from channel 1
->!> Installing lsb from channel 1
->!> Installing lvm2 from channel 1
->!> Installing lukemftp from channel 1
->!> Installing m4 from channel 1
->!> Installing lzo from channel 1
->!> Installing mailx from channel 1
->!> Installing make from channel 1
->!> Installing man from channel 1
->!> Installing mcelog from channel 1
->!> Installing mdadm from channel 1
->!> Installing microcode_ctl from channel 1
->!> Installing mingetty from channel 1
->!> Installing mktemp from channel 1
->!> Installing mkinitrd from channel 1
->!> Installing mono-data-sqlite from channel 1
->!> Installing module-init-tools from channel 1
->!> Installing mono-core from channel 1
->!> Installing mono-data from channel 1
->!> Installing mono-web from channel 1
->!> Installing mozilla-nspr from channel 1
->!> Installing mozilla-nss from channel 1
->!> Installing mozilla-xulrunner181 from channel 1
->!> Installing mpt-status from channel 1
->!> Installing multipath-tools from channel 1
->!> Installing ncurses from channel 1
->!> Installing ncurses-32bit from channel 1
->!> Installing neon from channel 1
->!> Installing net-snmp from channel 1
->!> Installing net-tools from channel 1
->!> Installing netcat from channel 1
->!> Installing nfsidmap from channel 1
->!> Installing netpbm from channel 1
->!> Installing nfs-kernel-server from channel 1
->!> Installing nscd from channel 1
->!> Installing ntfsprogs from channel 1
->!> Installing numlockx from channel 1
->!> Installing numactl from channel 1
->!> Installing ocrad from channel 1
->!> Installing openSUSE-release from channel 1
->!> Installing openct from channel 1
->!> Installing openldap2-client from channel 1
->!> Installing openldap2-client-32bit from channel 1
->!> Installing openobex from channel 1
->!> Installing opensc from channel 1
->!> Installing openslp from channel 1
->!> Installing openssl from channel 1
->!> Installing openssh from channel 1
->!> Installing openssh-askpass from channel 1
->!> Installing opensuse-updater-kde from channel 1
->!> Installing orbit2 from channel 1
->!> Installing orbit2-32bit from channel 1
->!> Installing pam from channel 1
->!> Installing pam-config from channel 1
->!> Installing pam-modules from channel 1
->!> Installing pango from channel 1
->!> Installing parted from channel 1
->!> Installing pango-32bit from channel 1
->!> Installing patch from channel 1
->!> Installing pax from channel 1
->!> Installing pcmciautils from channel 1
->!> Installing pciutils from channel 1
->!> Installing pcre from channel 1
->!> Installing pcre-32bit from channel 1
->!> Installing pcsc-lite from channel 1
->!> Installing perl from channel 1
->!> Installing perl-Bootloader from channel 1
->!> Installing perl-Config-Crontab from channel 1
->!> Installing perl-Compress-Zlib from channel 1
->!> Installing perl-Crypt-SmbHash from channel 1
->!> Installing perl-Crypt-SSLeay from channel 1
->!> Installing perl-Digest-HMAC from channel 1
->!> Installing perl-Digest-MD4 from channel 1
->!> Installing perl-Digest-SHA1 from channel 1
->!> Installing perl-HTML-Parser from channel 1
->!> Installing perl-HTML-Tagset from channel 1
->!> Installing perl-IO-Zlib from channel 1
->!> Installing perl-Net-DNS from channel 1
->!> Installing perl-Net-IP from channel 1
->!> Installing perl-TermReadKey from channel 1
->!> Installing perl-URI from channel 1
->!> Installing perl-XML-Parser from channel 1
->!> Installing permissions from channel 1
->!> Installing perl-XML-Writer from channel 1
->!> Installing perl-gettext from channel 1
->!> Installing perl-libwww-perl from channel 1
->!> Installing perl-spamassassin from channel 1
->!> Installing poppler from channel 1
->!> Installing pm-utils from channel 1
->!> Installing pinentry from channel 1
->!> Installing pilot-link from channel 1
->!> Installing pkg-config from channel 1
->!> Installing pmtools from channel 1
->!> Installing poppler-qt from channel 1
->!> Installing popt from channel 1
->!> Installing portmap from channel 1
->!> Installing postfix from channel 1
->!> Installing powersave from channel 1
->!> Installing powersave-libs from channel 1
->!> Installing ppp from channel 1
->!> Installing pptp from channel 1
->!> Installing prctl from channel 1
->!> Installing preload from channel 1
->!> Installing procinfo from channel 1
->!> Installing procps from channel 1
->!> Installing procmail from channel 1
->!> Installing psmisc from channel 1
->!> Installing pwdutils from channel 1
->!> Installing python from channel 1
->!> Installing python-qt from channel 1
->!> Installing python-xml from channel 1
->!> Installing qca from channel 1
->!> Installing qt3 from channel 1
->!> Installing qt3-32bit from channel 1
->!> Installing qtcurve-gtk2 from channel 1
->!> Installing qtcurve-gtk2-32bit from channel 1
->!> Installing qtcurve-kde from channel 1
->!> Installing rdesktop from channel 1
->!> Installing recode from channel 1
->!> Installing reiserfs from channel 1
->!> Installing resmgr from channel 1
->!> Installing rpm from channel 1
->!> Installing rsync from channel 1
->!> Installing rrdtool from channel 1
->!> Installing ruby from channel 1
->!> Installing sane-backends from channel 1
->!> Installing sash from channel 1
->!> Installing sane-frontends from channel 1
->!> Installing sax2 from channel 1
->!> Installing sax2-gui from channel 1
->!> Installing sax2-ident from channel 1
->!> Installing sax2-libsax from channel 1
->!> Installing sax2-libsax-perl from channel 1
->!> Installing sax2-tools from channel 1
->!> Installing scsi from channel 1
->!> Installing scpm from channel 1
->!> Installing screen from channel 1
->!> Installing sed from channel 1
->!> Installing sensors from channel 1
->!> Installing shared-mime-info from channel 1
->!> Installing sharutils from channel 1
->!> Installing smartmontools from channel 1
->!> Installing smpppd from channel 1
->!> Installing speex from channel 1
->!> Installing spamassassin from channel 1
->!> Installing sqlite2 from channel 1
->!> Installing sqlite from channel 1
->!> Installing tcpdump from channel 1
->!> Installing strace from channel 1
->!> Installing syslog-ng from channel 1
->!> Installing suspend from channel 1
->!> Installing sudo from channel 1
->!> Installing sumf from channel 1
->!> Installing sysfsutils from channel 1
->!> Installing sysconfig from channel 1
->!> Installing sysvinit from channel 1
->!> Installing taglib from channel 1
->!> Installing tar from channel 1
->!> Installing tcl from channel 1
->!> Installing tcpd from channel 1
->!> Installing tcsh from channel 1
->!> Installing telnet from channel 1
->!> Installing terminfo from channel 1
->!> Installing timezone from channel 1
->!> Installing tightvnc from channel 1
->!> Installing tk from channel 1
->!> Installing udev from channel 1
->!> Installing ufraw-gimp from channel 1
->!> Installing ufraw from channel 1
->!> Installing unclutter from channel 1
->!> Installing unzip from channel 1
->!> Installing usbutils from channel 1
->!> Installing utempter from channel 1
->!> Installing util-linux from channel 1
->!> Installing v4l-conf from channel 1
->!> Installing vim from channel 1
->!> Installing vlan from channel 1
->!> Installing w3m from channel 1
->!> Installing wbxml2 from channel 1
->!> Installing wdiff from channel 1
->!> Installing wget from channel 1
->!> Installing wireless-tools from channel 1
->!> Installing wodim from channel 1
->!> Installing wpa_supplicant from channel 1
->!> Installing wol from channel 1
->!> Installing wv from channel 1
->!> Installing wvdial from channel 1
->!> Installing wvstreams from channel 1
->!> Installing x11-input-wacom-tools from channel 1
->!> Installing xaw3d from channel 1
->!> Installing x11-input-wacom from channel 1
->!> Installing x11-tools from channel 1
->!> Installing x11-input-synaptics from channel 1
->!> Installing xdmbgrd from channel 1
->!> Installing xdg-menu from channel 1
->!> Installing xorg-x11-driver-input from channel 1
->!> Installing xfsprogs from channel 1
->!> Installing xine-lib from channel 1
->!> Installing xinetd from channel 1
->!> Installing xli from channel 1
->!> Installing xlockmore from channel 1
->!> Installing xntp from channel 1
->!> Installing xorg-x11 from channel 1
->!> Installing xorg-x11-Xvnc from channel 1
->!> Installing xorg-x11-libX11-ccache from channel 1
->!> Installing xorg-x11-driver-video from channel 1
->!> Installing xorg-x11-libICE-32bit from channel 1
->!> Installing xorg-x11-libICE from channel 1
->!> Installing xorg-x11-libSM-32bit from channel 1
->!> Installing xorg-x11-libSM from channel 1
->!> Installing xorg-x11-libX11-32bit from channel 1
->!> Installing xorg-x11-libX11 from channel 1
->!> Installing xorg-x11-libXau-32bit from channel 1
->!> Installing xorg-x11-libXau from channel 1
->!> Installing xorg-x11-libXdmcp from channel 1
->!> Installing xorg-x11-libXext-32bit from channel 1
->!> Installing xorg-x11-libXext from channel 1
->!> Installing xorg-x11-libXfixes-32bit from channel 1
->!> Installing xorg-x11-libXfixes from channel 1
->!> Installing xorg-x11-libXmu-32bit from channel 1
->!> Installing xorg-x11-libXmu from channel 1
->!> Installing xorg-x11-libXp-32bit from channel 1
->!> Installing xorg-x11-libXp from channel 1
->!> Installing xorg-x11-libXpm-32bit from channel 1
->!> Installing xorg-x11-libXprintUtil from channel 1
->!> Installing xorg-x11-libXpm from channel 1
->!> Installing xorg-x11-libXprintUtil-32bit from channel 1
->!> Installing xorg-x11-libXrender-32bit from channel 1
->!> Installing xorg-x11-libXrender from channel 1
->!> Installing xorg-x11-libXt-32bit from channel 1
->!> Installing xorg-x11-libXt from channel 1
->!> Installing xorg-x11-libXv from channel 1
->!> Installing xorg-x11-libXv-32bit from channel 1
->!> Installing xorg-x11-libfontenc-32bit from channel 1
->!> Installing xorg-x11-libfontenc from channel 1
->!> Installing xorg-x11-libs from channel 1
->!> Installing xorg-x11-libs-32bit from channel 1
->!> Installing xorg-x11-libxkbfile-32bit from channel 1
->!> Installing xorg-x11-libxkbfile from channel 1
->!> Installing xorg-x11-server from channel 1
->!> Installing xournal from channel 1
->!> Installing xpdf-tools from channel 1
->!> Installing xscreensaver from channel 1
->!> Installing xstroke from channel 1
->!> Installing xterm from channel 1
->!> Installing xtermset from channel 1
->!> Installing yast2-control-center from channel 1
->!> Installing yast2-country from channel 1
->!> Installing xvkbd from channel 1
->!> Installing yast2 from channel 1
->!> Installing yast2-bootloader from channel 1
->!> Installing yast2-core from channel 1
->!> Installing yast2-hardware-detection from channel 1
->!> Installing yast2-ldap from channel 1
->!> Installing yast2-network from channel 1
->!> Installing yast2-mouse from channel 1
->!> Installing yast2-nis-client from channel 1
->!> Installing yast2-ncurses from channel 1
->!> Installing yast2-perl-bindings from channel 1
->!> Installing yast2-packager from channel 1
->!> Installing yast2-pkg-bindings from channel 1
->!> Installing yast2-profile-manager from channel 1
->!> Installing yast2-printer from channel 1
->!> Installing yast2-slp from channel 1
->!> Installing yast2-qt from channel 1
->!> Installing yast2-sound from channel 1
->!> Installing yast2-tune from channel 1
->!> Installing yast2-storage-evms from channel 1
->!> Installing yast2-storage from channel 1
->!> Installing yast2-transfer from channel 1
->!> Installing yast2-storage-lib from channel 1
->!> Installing yast2-update from channel 1
->!> Installing yast2-users from channel 1
->!> Installing yast2-xml from channel 1
->!> Installing yp-tools from channel 1
->!> Installing ypbind from channel 1
->!> Installing zip from channel 1
->!> Installing zisofs-tools from channel 1
->!> Installing zlib from channel 1
->!> Installing zvbi from channel 1
->!> Installing zlib-32bit from channel 1
->!> Installing zypper from channel 1
->!> Installing zsh from channel 1
->!> Installing pattern:base from channel 1
->!> Installing pattern:fonts from channel 1
->!> Installing pattern:imaging from channel 1
->!> Installing pattern:kde from channel 1
->!> Installing pattern:kde_basis from channel 1
->!> Installing pattern:kde_imaging from channel 1
->!> Installing pattern:kde_laptop from channel 1
->!> Installing pattern:laptop from channel 1
->!> Installing pattern:non_oss from channel 1
->!> Installing pattern:non_oss_java from channel 1
->!> Installing pattern:sw_management from channel 1
->!> Installing pattern:x11 from channel 1
->!> Installing pattern:yast2_basis from channel 1
!> Solution #1:
!> remove flac-32bit-1.1.2-34.x86_64
!> remove openssl-32bit-0.9.8d-17.x86_64
@@ -833,8 +44,6 @@
!> remove libsndfile-32bit-1.0.17-21.x86_64
!> remove gcc41-gij-32bit-4.1.2_20061115-7.x86_64
!> remove java-1_4_2-gcj-compat-32bit-1.4.2.0-66.x86_64
->!> install language:en-.noarch
->!> install language:en_US-.noarch
!> remove product:openSUSE-DVD9-retail-10.2.x86_64
!> install product:openSUSE-10.3.x86_64[1]
!> upgrade RealPlayer-10.0.8-33.i586 => RealPlayer-10.0.9-8.i586[1]

Modified: trunk/sat-solver/testsuite/yps.c
URL:
http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/yps.c?rev=8518&r1=8517&r2=8518&view=diff
==============================================================================
--- trunk/sat-solver/testsuite/yps.c (original)
+++ trunk/sat-solver/testsuite/yps.c Thu Feb 7 10:20:01 2008
@@ -57,7 +57,7 @@
queue_push(&plist, i);
}

- prune_best_version_arch(solv, pool, &plist);
+ prune_best_arch_name_version(solv, pool, &plist);

if (plist.count == 0)
{

--
To unsubscribe, e-mail: zypp-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: zypp-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages