December 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11883 - /trunk/sat-solver/bindings/repo.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:32 2008 New Revision: 11883 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11883&view=rev Log: Repo::search (limit search to repo) Modified: trunk/sat-solver/bindings/repo.i Modified: trunk/sat-solver/bindings/repo.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repo.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/repo.i (original) +++ trunk/sat-solver/bindings/repo.i Fri Dec 5 12:19:32 2008 @@ -187,5 +187,17 @@ yield d %} #endif + +#if defined(SWIGRUBY) + void search(const char *match, int flags, XSolvable *xs = NULL, const char *keyname = NULL) + { + Dataiterator *di; + di = swig_dataiterator_new($self->pool, $self, match, flags, xs, keyname); + while( dataiterator_step(di) ) { + rb_yield(SWIG_NewPointerObj((void*) di, SWIGTYPE_p__Dataiterator, 0)); + } + swig_dataiterator_free(di); + } +#endif } -- 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] r11882 - /trunk/sat-solver/bindings/pool.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:19:13 2008 New Revision: 11882 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11882&view=rev Log: conversion from Id to XSolvable Modified: trunk/sat-solver/bindings/pool.i Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Fri Dec 5 12:19:13 2008 @@ -57,6 +57,11 @@ ~Pool() { pool_free($self); } + XSolvable *solvable(int id) + { + return xsolvable_new( $self, (Id)id); + } + #if defined(SWIGRUBY) %{ /* -- 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] r11881 - in /trunk/sat-solver/bindings: rule.i satsolver.i
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:18:15 2008 New Revision: 11881 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11881&view=rev Log: make Rules accessible in bindings Added: trunk/sat-solver/bindings/rule.i Modified: trunk/sat-solver/bindings/satsolver.i Added: trunk/sat-solver/bindings/rule.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/rule.i?rev=1… ============================================================================== --- trunk/sat-solver/bindings/rule.i (added) +++ trunk/sat-solver/bindings/rule.i Fri Dec 5 12:18:15 2008 @@ -0,0 +1,25 @@ +/* + * Rule + */ + +%nodefault rule; +%rename(Rule) rule; +typedef struct rule {} Rule; + + +%extend Rule { + /* no constructor, Rule is embedded in Solver */ + + int p() + { return $self->p; } + + int d() + { return $self->d; } + + int w1() + { return $self->w1; } + + int w2() + { return $self->w2; } + +} Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?… ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Fri Dec 5 12:18:15 2008 @@ -378,5 +378,6 @@ %include "problem.i" %include "solution.i" %include "covenant.i" +%include "rule.i" %include "solver.i" %include "dataiterator.i" -- 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] r11880 - in /trunk/sat-solver/applayer: decision.c decision.h
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:17:38 2008 New Revision: 11880 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11880&view=rev Log: make decisionq_why accessible Modified: trunk/sat-solver/applayer/decision.c trunk/sat-solver/applayer/decision.h Modified: trunk/sat-solver/applayer/decision.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.c?r… ============================================================================== --- trunk/sat-solver/applayer/decision.c (original) +++ trunk/sat-solver/applayer/decision.c Fri Dec 5 12:17:38 2008 @@ -20,13 +20,14 @@ #include "solverdebug.h" Decision * -decision_new( Pool *pool, int op, Id solvable, Id reason ) +decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ) { Decision *d = (Decision *)malloc( sizeof( Decision )); d->pool = pool; d->op = op; d->solvable = solvable; d->reason = reason; + d->rule = rule; return d; } @@ -43,6 +44,7 @@ Repo *installed = solver->installed; Id p, *obsoletesmap = solver_create_decisions_obsoletesmap( solver ); Id s, r; + int why; int op; Decision *d; int i; @@ -72,6 +74,7 @@ for ( i = 0; i < solver->decisionq.count; i++) { p = solver->decisionq.elements[i]; + why = solver->decisionq_why.elements[i]; r = 0; if (p < 0) /* remove */ @@ -119,7 +122,7 @@ } } } - d = decision_new( pool, op, s, r ); + d = decision_new( pool, op, s, r, why ? solver->rules + why : NULL ); if (callback( d, user_data )) break; } Modified: trunk/sat-solver/applayer/decision.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/decision.h?r… ============================================================================== --- trunk/sat-solver/applayer/decision.h (original) +++ trunk/sat-solver/applayer/decision.h Fri Dec 5 12:17:38 2008 @@ -32,9 +32,10 @@ Pool *pool; Id solvable; Id reason; + Rule *rule; } Decision; -Decision *decision_new( Pool *pool, int op, Id solvable, Id reason ); +Decision *decision_new( Pool *pool, int op, Id solvable, Id reason, Rule *rule ); void decision_free( Decision *d ); void solver_decisions_iterate( Solver *solver, int (*callback)( const Decision *d, void *user_data ), void *user_data); -- 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] r11879 - /trunk/sat-solver/applayer/xsolvable.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 12:16:38 2008 New Revision: 11879 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11879&view=rev Log: creating xsolvable with Id 0 will return NULL Modified: trunk/sat-solver/applayer/xsolvable.c Modified: trunk/sat-solver/applayer/xsolvable.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/applayer/xsolvable.c?… ============================================================================== --- trunk/sat-solver/applayer/xsolvable.c (original) +++ trunk/sat-solver/applayer/xsolvable.c Fri Dec 5 12:16:38 2008 @@ -28,11 +28,14 @@ XSolvable * xsolvable_new( Pool *pool, Id id ) { - XSolvable *xsolvable = (XSolvable *)malloc( sizeof( XSolvable )); - xsolvable->pool = pool; - xsolvable->id = id; + if (id) { + XSolvable *xsolvable = (XSolvable *)malloc( sizeof( XSolvable )); + xsolvable->pool = pool; + xsolvable->id = id; - return xsolvable; + return xsolvable; + } + return NULL; } -- 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] r11878 - /trunk/libzypp/zypp/solver/detail/SATResolver.cc
by mlandres＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlandres Date: Fri Dec 5 11:35:53 2008 New Revision: 11878 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11878&view=rev Log: comment added Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc Modified: trunk/libzypp/zypp/solver/detail/SATResolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/SATRe… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SATResolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/SATResolver.cc Fri Dec 5 11:35:53 2008 @@ -586,6 +586,8 @@ // Solvables which were selected due requirements which have been made by the user will // be selected by USER. // FIXME: The request queue should contains the TransactBy field + // ma: this is also deadly for the UI as it converts the requirement into a fix selection, + // which will serve as user input on the next solver run. for (CapabilitySet::const_iterator iter = requires_caps.begin(); iter != requires_caps.end(); iter++) { sat::WhatProvides rpmProviders(*iter); for_( iter2, rpmProviders.begin(), rpmProviders.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] r11877 - /trunk/zypper/doc/zypper.8
by jkupec＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: jkupec Date: Fri Dec 5 11:12:23 2008 New Revision: 11877 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11877&view=rev Log: - some package --type info added Modified: trunk/zypper/doc/zypper.8 Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=11877&r1… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Fri Dec 5 11:12:23 2008 @@ -90,7 +90,9 @@ \- group of packages which are necessary to install a product .LP Throughout this manual we will refer to resolvables simply as \fIpackages\fR -and to resolvable types as \fIpackage types\fR. +and to resolvable types as \fIpackage types\fR. These type names can be used +as arguments of \fI--type\fR option in several commands like \fBinstall\fR, +\fBinfo\fR, or \fBsearch\fR. .SS Package Dependencies .LP @@ -158,8 +160,8 @@ option can be used multiple times. .TP .I \-t, \-\-type <type> -Type of package (default: package). Currently supported package types for -the info command are: package, patch, pattern, product. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP .B install (in) [options] <name|capability|rpm_file_uri> ... @@ -222,8 +224,30 @@ option can be used multiple times. .TP \fI\-t, \-\-type\fR <type> -Type of package (default: package). See the beginning of this subsection for the list -of available package types. +Type of package to install (default: package). See section \fBPackage Types\fR +for list of available package types. + +If \fIpattern\fR is specified, and the pattern is not yet installed, +all packages required and recommended by the pattern will be installed. +A pattern is considered installed if all the packages and patterns +it requires are installed. Thus a pattern can be evalueated as installed +even if you do not install the pattern itself, but rather the packages +it requries. Use \fBzypper search -t pattern [name]\fR to look for available +patterns and \fBzypper info -t pattern <name>\fR to list its contents. + +If \fIpatch\fR is specified, zypper will install and/or remove packages +to satisfy specified patch. This is a way to ensure that specific +bug fix is installed. Like patterns, patches can also be evaluated as installed +by installing the packages needed to satisfy the patch. +Use \fBzypper list-patches\fR to look for available +needed patches and \fBzypper info -t patch <name>\fR to display detailed +information about a patch. + +If \fIproduct\fR is specified, zypper ensures all packages required +by the product are installed. Use \fBzypper se -t product [name]\fR to look +for available products and \fBzypper info -t product <name>\fR to display +detailed information about a product. + .TP .I \-n, \-\-name Select packages by their name, don't try to select by capabilities. @@ -335,15 +359,7 @@ Remove (uninstall) packages. The packages can be selected by their name or by a capability they provide. -For details on package selection see the install command description. - -Since \fBpatches\fR are not installed in sense of copying files or recording -a database entry, they cannot be uninstalled, even though zypper shows -them as installed. The installed status is determined solely based on -the installed status of its required dependencies. If these dependencies -are satisified, the patch is rendered installed. - -Uninstallation of \fBpatterns\fR is currently not implemented. +For details on package selection see the \fBinstall\fR command description. .TP \fI\-r, \-\-repo\fR <alias|#|URI> @@ -351,8 +367,16 @@ option can be used multiple times. .TP \fI\-t, -\-type\fR <type> -Type of package (default: package). See the beginning of this subsection for the list +Type of package (default: package). See section \fBPackage Types\fR for list of available package types. + +Since \fBpatches\fR are not installed in sense of copying files or recording +a database entry, they cannot be uninstalled, even though zypper shows +them as installed. The installed status is determined solely based on +the installed status of its required dependencies. If these dependencies +are satisified, the patch is rendered installed. + +Uninstallation of \fBpatterns\fR is currently not implemented. .TP .I \-n, \-\-name Select packages by their name (default). @@ -393,8 +417,8 @@ .TP \fI\-t, --type\fR <type> -Type of package (default: package). See Package Managemet Commands subsection -for the list of available package types. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -422,8 +446,8 @@ .TP \fI\-t, -\-type\fR <type> -Type of package (default: package). See Package Management Commands subsection -for the list of available package types. +Type of package (default: package). See section \fBPackage Types\fR for list +of available package types. .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -546,8 +570,6 @@ .IP Results of search are printed in a table with following columns: S (status), Catalog, Type (type of package), Name, Version, Arch (architecture). Status column can contain following values: i - installed, v - another version installed, or an empty space for neither of the former cases. .IP -In \fBrug compatibility mode\fR the --type option defaults to \fBpackage\fR. Furthermore, Instead of the Type column, rug's Bundle column is printed, however, with no contents. -.IP This command accepts the following options: .TP @@ -579,8 +601,11 @@ Show only packages that are not currently installed. .TP .I \-t, -\-type <type> -Search only for packages of specified type. See the beginning of the subsection for the list of available package types. -Multiple \-t option are allowed. +Search only for packages of specified type. See section \fBPackage Types\fR for list +of available package types. Multiple \-t option are allowed. + +See also the type-specific query commands like \fBpackages\fR, \fBpatterns\fR, etc. + .TP \fI\-r, \-\-repo\fR <alias|#|URI> Work only with the repository specified by the alias, number or URI. This @@ -1028,7 +1053,9 @@ Restrict the lock to the specified repository. .TP .I \-t, \-\-type <type> -Type of resolvable (package, patch, pattern, product). Default: package. +Lock only packages of specified type (default: package). +See section \fBPackage Types\fR for list +of available package types. .TP .B removelock (rl) [options] <lock-number|package-name> ... @@ -1374,9 +1401,6 @@ mode. The update operation is restricted to the specified repositories. .RS .TP -.I \-t, \-\-type -This option defaults to 'package' in rug compatibility mode. Zypper's default is 'patch'. -.TP .I \-y, \-\-no\-confirm Don't require user interaction. This option is implemented using zypper's non-interactive mode. .TP @@ -1400,6 +1424,13 @@ .TP .I rug search (se) zypper search (se) +.IP +Instead of the Type column, rug's Bundle column is printed, however, with no contents. +.RS +.TP +.I \-t, \-\-type +In rug compatibility mode the --type option defaults to \fIpackage\fR. Zypper +searches all package types by default. .TP \fI \-\-sort\-by\-catalog\fR Sort packages by catalog, not by name. This option is an alias to zypper'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] r11876 - /trunk/sat-solver/src/solver.c
by kkaempf＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: kkaempf Date: Fri Dec 5 10:46:23 2008 New Revision: 11876 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11876&view=rev Log: extend comment 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=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Dec 5 10:46:23 2008 @@ -298,11 +298,12 @@ * d == 0: unary rule, assertion => (A) or (-A) * * Install: p > 0, d = 0 (A) user requested install - * Remove: p < 0, d = 0 (-A) user requested remove + * Remove: p < 0, d = 0 (-A) user requested remove (also: uninstallable) * Requires: p < 0, d > 0 (-A|B1|B2|...) d: <list of providers for requirement of p> * Updates: p > 0, d > 0 (A|B1|B2|...) d: <list of updates for solvable p> * Conflicts: p < 0, d < 0 (-A|-B) either p (conflict issuer) or d (conflict provider) (binary rule) - * ? p > 0, d < 0 (A|-B) + * also used for obsoletes + * ?: p > 0, d < 0 (A|-B) * No-op ?: p = 0, d = 0 (null) (used as policy rule placeholder) * * resulting watches: -- 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] r11875 - /trunk/sat-solver/src/solver.c
by mlschroe＠svn.opensuse.org 05 Dec '08

05 Dec '08

Author: mlschroe Date: Fri Dec 5 10:42:59 2008 New Revision: 11875 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11875&view=rev Log: - initialize decisioncount before installing supplemented packages 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=1187… ============================================================================== --- trunk/sat-solver/src/solver.c (original) +++ trunk/sat-solver/src/solver.c Fri Dec 5 10:42:59 2008 @@ -2918,7 +2918,7 @@ if (dq.count) { Map dqmap; - int decisioncount; + int decisioncount = solv->decisionq.count; if (dq.count == 1) { @@ -2952,7 +2952,7 @@ if (level <= olevel) break; } - if (i < dqs.count) + if (i < dqs.count || solv->decisionq.count < decisioncount) { map_free(&dqmap); continue; @@ -2961,7 +2961,6 @@ /* install all recommended packages */ /* more work as we want to created branches if multiple * choices are valid */ - decisioncount = solv->decisionq.count; for (i = 0; i < decisioncount; i++) { Id rec, *recp, pp; -- 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] r11874 - /trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution
by mlschroe＠svn.opensuse.org 04 Dec '08

04 Dec '08

Author: mlschroe Date: Thu Dec 4 18:06:50 2008 New Revision: 11874 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11874&view=rev Log: - revert again Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Modified: trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tests/solver/data.lib… ============================================================================== --- trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution (original) +++ trunk/sat-solver/tests/solver/data.libzypp/real-life-tests/11.0beta1-gnome-test.solution Thu Dec 4 18:06:50 2008 @@ -248,8 +248,6 @@ >!> install galago-sharp-0.5.0-216.noarch[openSUSE-DVD 11.0] >!> install gawk-3.1.5h-29.i586[openSUSE-DVD 11.0] >!> install gcalctool-5.22.1-3.i586[openSUSE-DVD 11.0] ->!> install gcc-gij-4.3-30.i586[openSUSE-DVD 11.0] ->!> install gcc43-gij-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install gconf-editor-2.22.0-13.i586[openSUSE-DVD 11.0] >!> install gconf-sharp2-2.20.0-1.i586[openSUSE-DVD 11.0] >!> install gconf2-2.22.0-13.i586[openSUSE-DVD 11.0] @@ -405,7 +403,6 @@ >!> install iputils-ss021109-257.i586[openSUSE-DVD 11.0] >!> install iso-codes-2.0-4.noarch[openSUSE-DVD 11.0] >!> install iso_ent-2000.11.03-769.noarch[openSUSE-DVD 11.0] ->!> install java-1_5_0-gcj-compat-1.5.0.0-49.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install java-1_6_0-sun-plugin-1.6.0.u5-5.i586[openSUSE-DVD 11.0] >!> install joe-3.5-94.i586[openSUSE-DVD 11.0] @@ -476,8 +473,6 @@ >!> install libgail-gnome-1.20.0-86.i586[openSUSE-DVD 11.0] >!> install libgalago-0.5.2-101.i586[openSUSE-DVD 11.0] >!> install libgcc43-4.3.1_20080409-2.i586[openSUSE-DVD 11.0] ->!> install libgcj43-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] ->!> install libgcj43-jar-4.3.1_20080409-3.i586[openSUSE-DVD 11.0] >!> install libgcrypt11-1.4.0-3.i586[openSUSE-DVD 11.0] >!> install libgda-3.1.2-23.i586[openSUSE-DVD 11.0] >!> install libgda-3_0-3.1.2-23.i586[openSUSE-DVD 11.0] @@ -1047,4 +1042,4 @@ >!> install zlib-1.2.3-105.i586[openSUSE-DVD 11.0] >!> install zsh-4.3.6-5.i586[openSUSE-DVD 11.0] >!> install zypper-0.11.0-3.i586[openSUSE-DVD 11.0] ->!> installs=1042, upgrades=0, uninstalls=0 +>!> installs=1037, upgrades=0, 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