June 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - fix kernel dep rewriting [bnc#512726]
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/master commit decac4534f75d6f89959fd89f7e6da4d2bb31fa4 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 12:15:19 2009 +0200 - fix kernel dep rewriting [bnc#512726] --- src/repo_helix.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/repo_helix.c b/src/repo_helix.c index 01e08e3..ebeff07 100644 --- a/src/repo_helix.c +++ b/src/repo_helix.c @@ -658,13 +658,10 @@ endElement(void *userData, const char *name) } - if (!strncmp(depname, "kernel(", strlen("kernel(")) && !strchr(depname, ':')) + if (!strncmp(depname, "kernel(", 7) && !strchr(depname, ':')) { char newdep[100]; - strcpy(newdep, "kernel("); - strncat(newdep, cflavor, sizeof(newdep) - 1); - strncat(newdep, ":", sizeof(newdep) - 1); - strncat(newdep, depname + strlen("kernel("), sizeof(newdep) - 1); + snprintf(newdep, sizeof(newdep), "kernel(%s:%s", cflavor, depname + 7); pid = str2id(pool, newdep, 1); if (prd) pid = rel2id(pool, pid, prd->evr, prd->flags, 1); @@ -695,13 +692,10 @@ endElement(void *userData, const char *name) depname = id2str(pool, pid); } - if (!strncmp(depname, "kernel(", strlen("kernel(")) && !strchr(depname, ':')) + if (!strncmp(depname, "kernel(", 7) && !strchr(depname, ':')) { char newdep[100]; - strcpy(newdep, "kernel("); - strncat(newdep, cflavor, sizeof(newdep) - 1); - strncat(newdep, ":", sizeof(newdep) - 1); - strncat(newdep, depname + strlen("kernel("), sizeof(newdep) - 1); + snprintf(newdep, sizeof(newdep), "kernel(%s:%s", cflavor, depname + 7); pid = str2id(pool, newdep, 1); if (prd) pid = rel2id(pool, pid, prd->evr, prd->flags, 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] <libzypp> master : Use rpm variables in specfile.
by Michael Andres 15 Jun '09

15 Jun '09

ref: refs/heads/master commit cc03d88ae4b6a80cb335b1850f10f2fdca9db5bd Author: Michael Andres <ma(a)suse.de> Date: Mon Jun 15 12:15:04 2009 +0200 Use rpm variables in specfile. --- libzypp.spec.cmake | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libzypp.spec.cmake b/libzypp.spec.cmake index 9f74f28..2ea1858 100644 --- a/libzypp.spec.cmake +++ b/libzypp.spec.cmake @@ -18,8 +18,8 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: @VERSION@ Release: 0 -Source: @PACKAGE@-@VERSION@.tar.bz2 -Source1: @PACKAGE@-rpmlintrc +Source: %{name}-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc Prefix: /usr Provides: yast2-packagemanager Obsoletes: yast2-packagemanager @@ -78,7 +78,7 @@ Authors: Ladislav Slezak <lslezak(a)suse.cz> %package devel -Requires: libzypp == @VERSION@ +Requires: libzypp == %{version} Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake libsatsolver-devel >= 0.13.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] <sat-solver> SuSE-Code-11-Branch : - fix kernel dep rewriting [bnc#512726]
by Michael Schroeder 15 Jun '09

15 Jun '09

ref: refs/heads/SuSE-Code-11-Branch commit 0fb68f621043f241a72344e19050ecc56278a031 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 15 12:12:39 2009 +0200 - fix kernel dep rewriting [bnc#512726] --- src/repo_helix.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/repo_helix.c b/src/repo_helix.c index 01e08e3..ebeff07 100644 --- a/src/repo_helix.c +++ b/src/repo_helix.c @@ -658,13 +658,10 @@ endElement(void *userData, const char *name) } - if (!strncmp(depname, "kernel(", strlen("kernel(")) && !strchr(depname, ':')) + if (!strncmp(depname, "kernel(", 7) && !strchr(depname, ':')) { char newdep[100]; - strcpy(newdep, "kernel("); - strncat(newdep, cflavor, sizeof(newdep) - 1); - strncat(newdep, ":", sizeof(newdep) - 1); - strncat(newdep, depname + strlen("kernel("), sizeof(newdep) - 1); + snprintf(newdep, sizeof(newdep), "kernel(%s:%s", cflavor, depname + 7); pid = str2id(pool, newdep, 1); if (prd) pid = rel2id(pool, pid, prd->evr, prd->flags, 1); @@ -695,13 +692,10 @@ endElement(void *userData, const char *name) depname = id2str(pool, pid); } - if (!strncmp(depname, "kernel(", strlen("kernel(")) && !strchr(depname, ':')) + if (!strncmp(depname, "kernel(", 7) && !strchr(depname, ':')) { char newdep[100]; - strcpy(newdep, "kernel("); - strncat(newdep, cflavor, sizeof(newdep) - 1); - strncat(newdep, ":", sizeof(newdep) - 1); - strncat(newdep, depname + strlen("kernel("), sizeof(newdep) - 1); + snprintf(newdep, sizeof(newdep), "kernel(%s:%s", cflavor, depname + 7); pid = str2id(pool, newdep, 1); if (prd) pid = rel2id(pool, pid, prd->evr, prd->flags, 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] <sat-solver> master : implement --exclude parameter
by Dirk Mueller 11 Jun '09

11 Jun '09

ref: refs/heads/master commit 317d00a76492d05ce3483340294a5f1c7e4c633f Author: Dirk Mueller <dmueller(a)suse.de> Date: Thu Jun 11 22:11:40 2009 +0200 implement --exclude parameter installcheck can be called with a whitespace seperated list of substrings that are matched against package names and that are excluded from checking. This is useful to ignore e.g. known or wanted dependency errors. Also added a small usage() implementation --- tools/installcheck.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 1 deletions(-) diff --git a/tools/installcheck.c b/tools/installcheck.c index 4306252..cf3c750 100644 --- a/tools/installcheck.c +++ b/tools/installcheck.c @@ -1,3 +1,14 @@ +/* vim: sw=2 et cino=>4,n-2,{1s + */ + +/* + * Copyright (c) 2009, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + + #define _GNU_SOURCE #include <stdio.h> @@ -46,6 +57,15 @@ myfopen(const char *fn) return fopencookie(gzf, "r", cio); } +void +usage(char** argv) +{ + printf("Usage:\n%s: <arch> repo [--nocheck repo]...\n", + argv[0]); + exit(1); +} + + int main(int argc, char **argv) { @@ -55,14 +75,18 @@ main(int argc, char **argv) Queue rids; Queue cand; Queue archlocks; - char *arch; + char *arch, *exclude_pat; int i, j; Id p; Id rpmid, rpmarch, rpmrel, archlock; int status = 0; int nocheck = 0; + exclude_pat = 0; archlock = 0; + if (argc < 3) + usage(argv); + arch = argv[1]; pool = pool_create(); pool_setarch(pool, arch); @@ -77,6 +101,17 @@ main(int argc, char **argv) nocheck = pool->nsolvables; continue; } + if (!strcmp(argv[i], "--exclude")) + { + if (i + 1 >= argc) + { + printf("--exclude needs a whitespace separated list of substrings as parameter\n"); + exit(1); + } + exclude_pat = argv[i + 1]; + ++i; + continue; + } l = strlen(argv[i]); if (!strcmp(argv[i], "-")) fp = stdin; @@ -211,6 +246,26 @@ main(int argc, char **argv) p = cand.elements[i]; if (nocheck && p >= nocheck) continue; + if (exclude_pat) + { + char *ptr, *save = 0, *pattern; + int match = 0; + pattern = strdup(exclude_pat); + + for (ptr = strtok_r(pattern, " ", &save); + ptr; + ptr = strtok_r(NULL, " ", &save)) + { + if (*ptr && strstr(solvid2str(pool, p), ptr)) + { + match = 1; + break; + } + } + free(pattern); + if (match) + continue; + } s = pool->solvables + p; solv = solver_create(pool); queue_empty(&job); -- 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] <zypper> master : Typos
by Ján Kupec 11 Jun '09

11 Jun '09

ref: refs/heads/master commit 88a715d3d43f2e0843040160aed9f1b1dd0a0358 Author: Ján Kupec <jkupec(a)suse.cz> Date: Thu Jun 11 14:36:47 2009 +0200 Typos --- doc/zypper.8 | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/zypper.8 b/doc/zypper.8 index b0a916e..47e07f7 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -1195,7 +1195,7 @@ TODO more info .SS Package Locks Management -Package locks server the purpose of preventing changes to the set of installed +Package locks serve the purpose of preventing changes to the set of installed packages on the system. The locks are stored in form of a \fIquery\fR in /etc/zypp/locks file (see also locks(5)). Packages matching this query are then forbidden to change their installed @@ -1392,7 +1392,7 @@ packages. Note that the ZYpp lock is still created in the original system, as well as temporary files. See also the FILES section. .TP .I \ \ \ \ \-\-disable\-system\-resolvables -This option servers mainly for testing purposes. It will cause zypper to act +This option serves mainly for testing purposes. It will cause zypper to act as if there were no packages installed in the system. Use with caution as you can damage your system using this option. @@ -1599,7 +1599,7 @@ possible to turn the forcing of resolution off using this option even in rug-compatible mode. .TP .I \-\-entire\-catalog <catalog> -This option servers for marking all packages from specified catalog for +This option serves for marking all packages from specified catalog for installation. This is achieved by simulating 'zypper in --from <repo> '*''. .RE -- 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] <sat-solver> master : - look at repo/medianr when ordering the transaction
by Michael Schroeder 09 Jun '09

09 Jun '09

ref: refs/heads/master commit 0efe93ebb07236cb5d4e175c1954aa7d3a28e298 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 9 17:41:50 2009 +0200 - look at repo/medianr when ordering the transaction --- src/transaction.c | 91 ++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 73 insertions(+), 18 deletions(-) diff --git a/src/transaction.c b/src/transaction.c index 996f8a5..a07ef8e 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -1120,11 +1120,14 @@ transaction_order(Transaction *trans, int flags) int i, j, k, numte, numedge; struct orderdata od; struct _TransactionElement *te; - Queue todo, obsq; + Queue todo, obsq, samerepoq, uninstq; int cycstart, cycel; Id *cycle, *obstypes; int oldcount; int start, now; + Repo *lastrepo; + int lastmedia; + Id *temedianr; start = now = sat_timems(0); POOL_DEBUG(SAT_DEBUG_STATS, "ordering transaction\n"); @@ -1330,10 +1333,19 @@ transaction_order(Transaction *trans, int flags) for (i = 1, te = od.tes + i; i < numte; i++, te++) for (j = te->edges; od.invedgedata[j]; j++) od.tes[od.invedgedata[j]].mark++; + + queue_init(&samerepoq); + queue_init(&uninstq); + queue_empty(&todo); for (i = 1, te = od.tes + i; i < numte; i++, te++) if (te->mark == 0) - queue_push(&todo, i); - assert(todo.count > 0); + { + if (installed && pool->solvables[te->p].repo == installed) + queue_push(&uninstq, i); + else + queue_push(&todo, i); + } + assert(todo.count > 0 || uninstq.count > 0); if (installed) { obstypes = sat_calloc(installed->end - installed->start, sizeof(Id)); @@ -1349,28 +1361,63 @@ transaction_order(Transaction *trans, int flags) obstypes = 0; oldcount = tr->count; queue_empty(tr); + queue_init(&obsq); - while (todo.count) + lastrepo = 0; + lastmedia = 0; + temedianr = sat_calloc(numte, sizeof(Id)); + for (i = 1; i < numte; i++) + { + Solvable *s = pool->solvables + od.tes[i].p; + if (installed && s->repo == installed) + j = 1; + else + j = solvable_lookup_num(s, SOLVABLE_MEDIANR, 1); + temedianr[i] = j; + } + for (;;) { - /* select an i */ - i = todo.count; - if (installed) + /* select an TE i */ + if (uninstq.count) + i = queue_shift(&uninstq); + else if (samerepoq.count) + i = queue_shift(&samerepoq); + else if (todo.count) { - for (i = 0; i < todo.count; i++) + /* find next repo/media */ + for (j = 0; j < todo.count; j++) { - j = todo.elements[i]; - if (pool->solvables[od.tes[j].p].repo == installed) - break; + if (!j || temedianr[todo.elements[j]] < lastmedia) + { + i = j; + lastmedia = temedianr[todo.elements[j]]; + } } + lastrepo = pool->solvables[od.tes[todo.elements[i]].p].repo; + + /* move all matching TEs to samerepoq */ + for (i = j = 0; j < todo.count; j++) + { + int k = todo.elements[j]; + if (temedianr[k] == lastmedia && pool->solvables[od.tes[k].p].repo == lastrepo) + queue_push(&samerepoq, k); + else + todo.elements[i++] = k; + } + todo.count = i; + + assert(samerepoq.count); + i = queue_shift(&samerepoq); } - if (i == todo.count) - i = 0; - te = od.tes + todo.elements[i]; + else + break; + + te = od.tes + i; queue_push(tr, te->type); queue_push(tr, te->p); #if 0 -printf("do %s\n", solvid2str(pool, te->p)); +printf("do %s [%d]\n", solvid2str(pool, te->p), temedianr[i]); #endif s = pool->solvables + te->p; if (installed && s->repo != installed) @@ -1389,22 +1436,30 @@ printf("do %s\n", solvid2str(pool, te->p)); } } } - queue_delete(&todo, i); for (j = te->edges; od.invedgedata[j]; j++) { struct _TransactionElement *te2 = od.tes + od.invedgedata[j]; assert(te2->mark > 0); if (--te2->mark == 0) { - queue_push(&todo, od.invedgedata[j]); + Solvable *s = pool->solvables + te2->p; #if 0 -printf("free %s\n", solvid2str(pool, od.tes[od.invedgedata[j]].p)); +printf("free %s [%d]\n", solvid2str(pool, te2->p), temedianr[od.invedgedata[j]]); #endif + if (installed && s->repo == installed) + queue_push(&uninstq, od.invedgedata[j]); + else if (s->repo == lastrepo && temedianr[od.invedgedata[j]] == lastmedia) + queue_push(&samerepoq, od.invedgedata[j]); + else + queue_push(&todo, od.invedgedata[j]); } } } sat_free(obstypes); + sat_free(temedianr); queue_free(&todo); + queue_free(&samerepoq); + queue_free(&uninstq); queue_free(&obsq); for (i = 1, te = od.tes + i; i < numte; i++, te++) assert(te->mark == 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] <libzypp-testsuite> master : Changes.
by Ján Kupec 09 Jun '09

09 Jun '09

ref: refs/heads/master commit 03c203ff2f27f978930995e7cda23b7249b08f9b Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jun 9 13:48:53 2009 +0200 Changes. --- package/libzypp-testsuite-tools.changes | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/package/libzypp-testsuite-tools.changes b/package/libzypp-testsuite-tools.changes index 9f0f276..45f70fb 100644 --- a/package/libzypp-testsuite-tools.changes +++ b/package/libzypp-testsuite-tools.changes @@ -1,9 +1,14 @@ ------------------------------------------------------------------- +Tue Jun 9 13:48:14 CEST 2009 - jkupec(a)suse.cz + +- fixed changed keyring callbacks +- version 4.2.7 + +------------------------------------------------------------------- Wed Jun 3 17:47:55 CEST 2009 - ma(a)suse.de - Add '--help' at least listing the tags and linking to the wiki page. -- version 4.2.7 ------------------------------------------------------------------- Tue Nov 4 15:46:33 CET 2008 - dmacvicar(a)suse.de -- 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] <libzypp-testsuite> master : Fixed changed keyring callbacks.
by Ján Kupec 09 Jun '09

09 Jun '09

ref: refs/heads/master commit 98443d680b76f429c36039d8d3e27634e4889d73 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jun 9 13:47:41 2009 +0200 Fixed changed keyring callbacks. --- solver/src/KeyRingCallbacks.h | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/solver/src/KeyRingCallbacks.h b/solver/src/KeyRingCallbacks.h index 7df7479..14219ba 100644 --- a/solver/src/KeyRingCallbacks.h +++ b/solver/src/KeyRingCallbacks.h @@ -30,14 +30,21 @@ namespace zypp { /////////////////////////////////////////////////////////////////// struct KeyRingReceive : public zypp::callback::ReceiveReport<zypp::KeyRingReport> { - virtual bool askUserToAcceptUnsignedFile( const std::string &file ) + virtual bool askUserToAcceptUnsignedFile( const std::string &file, const KeyContext & context ) { - XXX << "(" << file << ")" << std::endl; + XXX << "(" + << file << ", " + << (context.empty() ? "<unknown>" : context.repoInfo().alias()) + << ")" << std::endl; return true; } - virtual bool askUserToAcceptUnknownKey( const std::string &file, const std::string &id ) + virtual bool askUserToAcceptUnknownKey( const std::string &file, + const std::string &id, + const zypp::KeyContext & context ) { - XXX << "(" << file << ", " << id << ")" << std::endl; + XXX << "(" << file << ", " << id << ", " + << (context.empty() ? "<unknown>" : context.repoInfo().alias()) + << ")" << std::endl; return true; } virtual bool askUserToImportKey( const PublicKey &key ) @@ -49,9 +56,13 @@ namespace zypp { XXX << "(" << key << ")" << std::endl; return true; } - virtual bool askUserToAcceptVerificationFailed( const std::string &file, const PublicKey &key ) + virtual bool askUserToAcceptVerificationFailed( const std::string &file, + const PublicKey &key, + const zypp::KeyContext & context) { - XXX << "(" << file << ", " << key << ")" << std::endl; + XXX << "(" << file << ", " << key << ", " + << (context.empty() ? "<unknown>" : context.repoInfo().alias()) + << ")" << std::endl; return true; } }; -- 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] <sat-solver> master : - make orderdata private to be more flexible
by Michael Schroeder 08 Jun '09

08 Jun '09

ref: refs/heads/master commit 41f1aaf6b9fe7b2a76f5a8eee456556d0a5080f3 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 8 19:16:49 2009 +0200 - make orderdata private to be more flexible - add flags argument to transaction_order() --- src/transaction.c | 107 ++++++++++++++++++++++++++++------------- src/transaction.h | 19 +++----- tests/solver/deptestomatic.c | 2 +- 3 files changed, 81 insertions(+), 47 deletions(-) diff --git a/src/transaction.c b/src/transaction.c index b0cde03..996f8a5 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -311,25 +311,6 @@ create_transaction_info(Transaction *trans, Queue *decisionq, Map *noobsmap) } void -transaction_init(Transaction *trans, Pool *pool) -{ - memset(trans, 0, sizeof(*trans)); - trans->pool = pool; -} - -void -transaction_free(Transaction *trans) -{ - queue_free(&trans->steps); - queue_free(&trans->transaction_info); - trans->transaction_installed = sat_free(trans->transaction_installed); - map_free(&trans->transactsmap); - trans->tes = sat_free(trans->tes); - trans->ntes = 0; - trans->invedgedata = sat_free(trans->invedgedata); -} - -void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) { Pool *pool = trans->pool; @@ -427,6 +408,20 @@ transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) } } + +struct _TransactionElement { + Id p; /* solvable id */ + Id type; /* installation type */ + Id edges; /* pointer into edges data */ + Id mark; +}; + +struct _TransactionOrderdata { + struct _TransactionElement *tes; + int ntes; + Id *invedgedata; +}; + #define TYPE_BROKEN (1<<0) #define TYPE_CON (1<<1) @@ -441,6 +436,29 @@ transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) #define EDGEDATA_BLOCK 127 +void +transaction_init(Transaction *trans, Pool *pool) +{ + memset(trans, 0, sizeof(*trans)); + trans->pool = pool; +} + +void +transaction_free(Transaction *trans) +{ + queue_free(&trans->steps); + queue_free(&trans->transaction_info); + trans->transaction_installed = sat_free(trans->transaction_installed); + map_free(&trans->transactsmap); + if (trans->orderdata) + { + struct _TransactionOrderdata *od = trans->orderdata; + od->tes = sat_free(od->tes); + od->invedgedata = sat_free(od->invedgedata); + trans->orderdata = sat_free(trans->orderdata); + } +} + struct orderdata { Transaction *trans; struct _TransactionElement *tes; @@ -1092,7 +1110,7 @@ addcycleedges(struct orderdata *od, Id *cycle, Queue *todo) } void -transaction_order(Transaction *trans) +transaction_order(Transaction *trans, int flags) { Pool *pool = trans->pool; Queue *tr = &trans->steps; @@ -1108,8 +1126,17 @@ transaction_order(Transaction *trans) int oldcount; int start, now; - POOL_DEBUG(SAT_DEBUG_STATS, "ordering transaction\n"); start = now = sat_timems(0); + POOL_DEBUG(SAT_DEBUG_STATS, "ordering transaction\n"); + /* free old data if present */ + if (trans->orderdata) + { + struct _TransactionOrderdata *od = trans->orderdata; + od->tes = sat_free(od->tes); + od->invedgedata = sat_free(od->invedgedata); + trans->orderdata = sat_free(trans->orderdata); + } + /* create a transaction element for every active component */ numte = 0; for (i = 0; i < tr->count; i += 2) @@ -1120,10 +1147,10 @@ transaction_order(Transaction *trans) continue; numte++; } + POOL_DEBUG(SAT_DEBUG_STATS, "transaction elements: %d\n", numte); if (!numte) return; /* nothing to do... */ - POOL_DEBUG(SAT_DEBUG_STATS, "transaction elements: %d\n", numte); numte++; /* leave first one zero */ memset(&od, 0, sizeof(od)); od.trans = trans; @@ -1385,9 +1412,18 @@ printf("free %s\n", solvid2str(pool, od.tes[od.invedgedata[j]].p)); POOL_DEBUG(SAT_DEBUG_STATS, "creating new transaction took %d ms\n", sat_timems(now)); POOL_DEBUG(SAT_DEBUG_STATS, "transaction ordering took %d ms\n", sat_timems(start)); - trans->tes = od.tes; - trans->ntes = numte; - trans->invedgedata = od.invedgedata; + if ((flags & SOLVER_TRANSACTION_KEEP_ORDERDATA) != 0) + { + trans->orderdata = sat_calloc(1, sizeof(*trans->orderdata)); + trans->orderdata->tes = od.tes; + trans->orderdata->ntes = numte; + trans->orderdata->invedgedata = od.invedgedata; + } + else + { + sat_free(od.tes); + sat_free(od.invedgedata); + } } static void @@ -1504,19 +1540,22 @@ int transaction_add_choices(Transaction *trans, Queue *choices, Id chosen) { int i, j; + struct _TransactionOrderdata *od = trans->orderdata; struct _TransactionElement *te; + if (!od) + return choices->count; if (!chosen) { /* initialization step */ - for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) te->mark = 0; - for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) { - for (j = te->edges; trans->invedgedata[j]; j++) - trans->tes[trans->invedgedata[j]].mark++; + for (j = te->edges; od->invedgedata[j]; j++) + od->tes[od->invedgedata[j]].mark++; } - for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) if (!te->mark) { queue_push(choices, te->type); @@ -1524,19 +1563,19 @@ transaction_add_choices(Transaction *trans, Queue *choices, Id chosen) } return choices->count; } - for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) if (te->p == chosen) break; - if (i == trans->ntes) + if (i == od->ntes) return choices->count; if (te->mark > 0) { /* hey! out-of-order installation! */ te->mark = -1; } - for (j = te->edges; trans->invedgedata[j]; j++) + for (j = te->edges; od->invedgedata[j]; j++) { - te = trans->tes + trans->invedgedata[j]; + te = od->tes + od->invedgedata[j]; assert(te->mark > 0 || te->mark == -1); if (te->mark > 0 && --te->mark == 0) { diff --git a/src/transaction.h b/src/transaction.h index ea01d02..0099c84 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -22,14 +22,7 @@ extern "C" { #include "bitmap.h" struct _Pool; - -/* internal */ -struct _TransactionElement { - Id p; /* solvable id */ - Id type; /* installation type */ - Id edges; - Id mark; -}; +struct _TransactionOrderdata; typedef struct _Transaction { struct _Pool *pool; /* back pointer to pool */ @@ -40,9 +33,7 @@ typedef struct _Transaction { Id *transaction_installed; Map transactsmap; - struct _TransactionElement *tes; - int ntes; - Id *invedgedata; + struct _TransactionOrderdata *orderdata; } Transaction; @@ -76,8 +67,12 @@ extern void transaction_calculate(Transaction *trans, Queue *decisionq, Map *noo extern void solver_transaction_all_pkgs(Transaction *trans, Id p, Queue *pkgs); extern Id solver_transaction_pkg(Transaction *trans, Id p); extern Id solver_transaction_show(Transaction *trans, Id type, Id p, int mode); -extern void transaction_order(Transaction *trans); +extern void transaction_order(Transaction *trans, int flags); extern void transaction_check(Transaction *trans); +extern int transaction_add_choices(Transaction *trans, Queue *choices, Id chosen); + +/* order flags */ +#define SOLVER_TRANSACTION_KEEP_ORDERDATA (1 << 0) #ifdef __cplusplus } diff --git a/tests/solver/deptestomatic.c b/tests/solver/deptestomatic.c index 472d884..d310c2d 100644 --- a/tests/solver/deptestomatic.c +++ b/tests/solver/deptestomatic.c @@ -1534,7 +1534,7 @@ endElement( void *userData, const char *name ) } rc_printdecisions(solv, &pd->trials); #if 1 - transaction_order(&solv->trans); + transaction_order(&solv->trans, 0); transaction_check(&solv->trans); solver_printdecisions(solv); #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] <sat-solver> master : - update transaction ordering code
by Michael Schroeder 08 Jun '09

08 Jun '09

ref: refs/heads/master commit 6f658f3ae37e7f879ea662343acf8341c30585e6 Author: Michael Schroeder <mls(a)suse.de> Date: Mon Jun 8 17:20:20 2009 +0200 - update transaction ordering code - add queue insert/delete functions --- src/queue.c | 51 +++ src/queue.h | 5 + src/solvable.c | 23 ++ src/transaction.c | 696 ++++++++++++++++++++++++++++++++++-------- src/transaction.h | 20 ++- tests/solver/deptestomatic.c | 3 +- 6 files changed, 669 insertions(+), 129 deletions(-) diff --git a/src/queue.c b/src/queue.c index 345050f..38fd765 100644 --- a/src/queue.c +++ b/src/queue.c @@ -75,3 +75,54 @@ queue_alloc_one(Queue *q) } } +void +queue_insert(Queue *q, int pos, Id id) +{ + queue_push(q, id); /* make room */ + if (pos < q->count - 1) + { + memmove(q->elements + pos + 1, q->elements + pos, (q->count - 1 - pos) * sizeof(Id)); + q->elements[pos] = id; + } +} + +void +queue_delete(Queue *q, int pos) +{ + if (pos >= q->count) + return; + if (pos < q->count - 1) + memmove(q->elements + pos, q->elements + pos + 1, (q->count - 1 - pos) * sizeof(Id)); + q->left++; + q->count--; +} + +void +queue_insert2(Queue *q, int pos, Id id1, Id id2) +{ + queue_push(q, id1); /* make room */ + queue_push(q, id2); /* make room */ + if (pos < q->count - 2) + { + memmove(q->elements + pos + 2, q->elements + pos, (q->count - 2 - pos) * sizeof(Id)); + q->elements[pos] = id1; + q->elements[pos] = id2; + } +} + +void +queue_delete2(Queue *q, int pos) +{ + if (pos >= q->count) + return; + if (pos == q->count - 1) + { + q->left++; + q->count--; + return; + } + if (pos < q->count - 2) + memmove(q->elements + pos, q->elements + pos + 2, (q->count - 2 - pos) * sizeof(Id)); + q->left += 2; + q->count -= 2; +} diff --git a/src/queue.h b/src/queue.h index 4b3f9eb..090799e 100644 --- a/src/queue.h +++ b/src/queue.h @@ -106,4 +106,9 @@ extern void queue_init_buffer(Queue *q, Id *buf, int size); extern void queue_init_clone(Queue *t, Queue *s); extern void queue_free(Queue *q); +extern void queue_insert(Queue *q, int pos, Id id); +extern void queue_insert2(Queue *q, int pos, Id id1, Id id2); +extern void queue_delete(Queue *q, int pos); +extern void queue_delete2(Queue *q, int pos); + #endif /* SATSOLVER_QUEUE_H */ diff --git a/src/solvable.c b/src/solvable.c index 68a3855..6f6f590 100644 --- a/src/solvable.c +++ b/src/solvable.c @@ -42,6 +42,29 @@ solvable_lookup_id(Solvable *s, Id keyname) return repo_lookup_id(s->repo, s - s->repo->pool->solvables, keyname); } +int +solvable_lookup_idarray(Solvable *s, Id keyname, Queue *q) +{ + Dataiterator di; + int found = 0; + + queue_empty(q); + if (!s->repo) + return 0; + dataiterator_init(&di, s->repo->pool, s->repo, s - s->repo->pool->solvables, keyname, 0, SEARCH_ARRAYSENTINEL); + while (dataiterator_step(&di)) + { + if (di.key->type != REPOKEY_TYPE_IDARRAY && di.key->type != REPOKEY_TYPE_REL_IDARRAY) + continue; + found = 1; + if (di.kv.eof) + break; + queue_push(q, di.kv.id); + } + dataiterator_free(&di); + return found; +} + const char * solvable_lookup_str(Solvable *s, Id keyname) { diff --git a/src/transaction.c b/src/transaction.c index cfedc79..b0cde03 100644 --- a/src/transaction.c +++ b/src/transaction.c @@ -324,6 +324,9 @@ transaction_free(Transaction *trans) queue_free(&trans->transaction_info); trans->transaction_installed = sat_free(trans->transaction_installed); map_free(&trans->transactsmap); + trans->tes = sat_free(trans->tes); + trans->ntes = 0; + trans->invedgedata = sat_free(trans->invedgedata); } void @@ -433,42 +436,84 @@ transaction_calculate(Transaction *trans, Queue *decisionq, Map *noobsmap) #define TYPE_REQ (1<<4) #define TYPE_PREREQ (1<<5) -#define EDGEDATA_BLOCK 127 +#define TYPE_CYCLETAIL (1<<16) +#define TYPE_CYCLEHEAD (1<<17) -struct transel { - Id p; - Id type; - Id edges; - Id invedges; - Id mark; - Id medianr; - Id ddeg; /* unused */ -}; +#define EDGEDATA_BLOCK 127 struct orderdata { Transaction *trans; - struct transel *tes; + struct _TransactionElement *tes; int ntes; Id *edgedata; int nedgedata; Id *invedgedata; - Map cycletes; + + Queue cycles; + Queue cyclesdata; + int ncycles; }; static int +addteedge(struct orderdata *od, int from, int to, int type) +{ + int i; + struct _TransactionElement *te; + + if (from == to) + return 0; + + /* printf("edge %d(%s) -> %d(%s) type %x\n", from, solvid2str(pool, od->tes[from].p), to, solvid2str(pool, od->tes[to].p), type); */ + + te = od->tes + from; + for (i = te->edges; od->edgedata[i]; i += 2) + if (od->edgedata[i] == to) + break; + /* test of brokenness */ + if (type == TYPE_BROKEN) + return od->edgedata[i] && (od->edgedata[i + 1] & TYPE_BROKEN) != 0 ? 1 : 0; + if (od->edgedata[i]) + { + od->edgedata[i + 1] |= type; + return 0; + } + if (i + 1 == od->nedgedata) + { + /* printf("tail add %d\n", i - te->edges); */ + if (!i) + te->edges = ++i; + od->edgedata = sat_extend(od->edgedata, od->nedgedata, 3, sizeof(Id), EDGEDATA_BLOCK); + } + else + { + /* printf("extend %d\n", i - te->edges); */ + od->edgedata = sat_extend(od->edgedata, od->nedgedata, 3 + (i - te->edges), sizeof(Id), EDGEDATA_BLOCK); + if (i > te->edges) + memcpy(od->edgedata + od->nedgedata, od->edgedata + te->edges, sizeof(Id) * (i - te->edges)); + i = od->nedgedata + (i - te->edges); + te->edges = od->nedgedata; + } + od->edgedata[i] = to; + od->edgedata[i + 1] = type; + od->edgedata[i + 2] = 0; /* end marker */ + od->nedgedata = i + 3; + return 0; +} + +static int addedge(struct orderdata *od, Id from, Id to, int type) { Transaction *trans = od->trans; Pool *pool = trans->pool; Solvable *s; - struct transel *te; + struct _TransactionElement *te; int i; // printf("addedge %d %d type %d\n", from, to, type); s = pool->solvables + from; if (s->repo == pool->installed && trans->transaction_installed[from - pool->installed->start]) { - /* passive, map to active */ + /* obsolete, map to install */ if (trans->transaction_installed[from - pool->installed->start] > 0) from = trans->transaction_installed[from - pool->installed->start]; else @@ -488,7 +533,7 @@ addedge(struct orderdata *od, Id from, Id to, int type) s = pool->solvables + to; if (s->repo == pool->installed && trans->transaction_installed[to - pool->installed->start]) { - /* passive, map to active */ + /* obsolete, map to install */ if (trans->transaction_installed[to - pool->installed->start] > 0) to = trans->transaction_installed[to - pool->installed->start]; else @@ -506,7 +551,7 @@ addedge(struct orderdata *od, Id from, Id to, int type) } } - /* map target to te num */ + /* map from/to to te numbers */ for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) if (te->p == to) break; @@ -520,47 +565,10 @@ addedge(struct orderdata *od, Id from, Id to, int type) if (i == od->ntes) return 0; - if (i == to) - return 0; /* no edges to ourselfes */ - - /* printf("edge %d(%s) -> %d(%s) type %x\n", i, solvid2str(pool, od->tes[i].p), to, solvid2str(pool, od->tes[to].p), type); */ - - for (i = te->edges; od->edgedata[i]; i += 2) - if (od->edgedata[i] == to) - break; - /* test of brokenness */ - if (type == TYPE_BROKEN) - return od->edgedata[i] && (od->edgedata[i + 1] & TYPE_BROKEN) != 0 ? 1 : 0; - if (od->edgedata[i]) - { - od->edgedata[i + 1] |= type; - return 0; - } - if (i + 1 == od->nedgedata) - { - /* printf("tail add %d\n", i - te->edges); */ - if (!i) - te->edges = ++i; - od->edgedata = sat_extend(od->edgedata, od->nedgedata, 3, sizeof(Id), EDGEDATA_BLOCK); - } - else - { - /* printf("extend %d\n", i - te->edges); */ - od->edgedata = sat_extend(od->edgedata, od->nedgedata, 3 + (i - te->edges), sizeof(Id), EDGEDATA_BLOCK); - if (i > te->edges) - memcpy(od->edgedata + od->nedgedata, od->edgedata + te->edges, sizeof(Id) * (i - te->edges)); - i = od->nedgedata + (i - te->edges); - te->edges = od->nedgedata; - } - od->edgedata[i] = to; - od->edgedata[i + 1] = type; - od->edgedata[i + 2] = 0; - od->nedgedata = i + 3; - te->ddeg++; - od->tes[to].ddeg--; - return 0; + return addteedge(od, i, to, type); } +#if 1 static int havechoice(struct orderdata *od, Id p, Id q1, Id q2) { @@ -572,7 +580,9 @@ havechoice(struct orderdata *od, Id p, Id q1, Id q2) /* both q1 and q2 are uninstalls. check if their TEs intersect */ /* common case: just one TE for both packages */ +#if 0 printf("havechoice %d %d %d\n", p, q1, q2); +#endif if (trans->transaction_installed[q1 - pool->installed->start] == 0) return 1; if (trans->transaction_installed[q2 - pool->installed->start] == 0) @@ -598,6 +608,34 @@ havechoice(struct orderdata *od, Id p, Id q1, Id q2) queue_free(&ti2); return 1; } +#endif + +static inline int +havescripts(Pool *pool, Id solvid) +{ + Solvable *s = pool->solvables + solvid; + const char *dep; + if (s->requires) + { + Id req, *reqp; + int inpre = 0; + reqp = s->repo->idarraydata + s->requires; + while ((req = *reqp++) != 0) + { + if (req == SOLVABLE_PREREQMARKER) + { + inpre = 1; + continue; + } + if (!inpre) + continue; + dep = id2str(pool, req); + if (*dep == '/' && strcmp(dep, "/sbin/ldconfig") != 0) + return 1; + } + } + return 0; +} static void addsolvableedges(struct orderdata *od, Solvable *s) @@ -610,7 +648,11 @@ addsolvableedges(struct orderdata *od, Solvable *s) Repo *installed = pool->installed; Solvable *s2; Queue reqq; + int provbyinst; +#if 0 + printf("addsolvableedges %s\n", solvable2str(pool, s)); +#endif p = s - pool->solvables; queue_init(&reqq); if (s->requires) @@ -624,8 +666,17 @@ addsolvableedges(struct orderdata *od, Solvable *s) pre = TYPE_PREREQ; continue; } +#if 0 + if (pre != TYPE_PREREQ && installed && s->repo == installed) + { + /* ignore normal requires if we're getting obsoleted */ + if (trans->transaction_installed[p - pool->installed->start]) + continue; + } +#endif queue_empty(&reqq); numins = 0; /* number of packages to be installed providing it */ + provbyinst = 0; /* provided by kept package */ FOR_PROVIDES(p2, pp2, req) { s2 = pool->solvables + p2; @@ -636,8 +687,14 @@ addsolvableedges(struct orderdata *od, Solvable *s) } if (s2->repo == installed && !MAPTST(&trans->transactsmap, p2)) { + provbyinst = 1; +#if 0 + printf("IGNORE inst provides %s by %s\n", dep2str(pool, req), solvable2str(pool, s2)); reqq.count = 0; /* provided by package that stays installed */ break; +#else + continue; +#endif } if (s2->repo != installed && !MAPTST(&trans->transactsmap, p2)) continue; /* package stays uninstalled */ @@ -654,11 +711,40 @@ addsolvableedges(struct orderdata *od, Solvable *s) if (s2->repo == installed) continue; /* s2 gets uninstalled */ queue_pushunique(&reqq, p2); - /* EDGE s(A) -> s2(A) */ } } + if (provbyinst) + { + /* prune to harmless ->inst edges */ + for (i = j = 0; i < reqq.count; i++) + if (pool->solvables[reqq.elements[i]].repo != installed) + reqq.elements[j++] = reqq.elements[i]; + reqq.count = j; + } + if (numins && reqq.count) { + if (s->repo == installed) + { + for (i = 0; i < reqq.count; i++) + { + if (pool->solvables[reqq.elements[i]].repo == installed) + { + for (j = 0; j < reqq.count; j++) + { + if (pool->solvables[reqq.elements[j]].repo != installed) + { + if (trans->transaction_installed[reqq.elements[i] - pool->installed->start] == reqq.elements[j]) + continue; /* no self edge */ +#if 0 + printf("add interrreq uninst->inst edge (%s -> %s -> %s)\n", solvid2str(pool, reqq.elements[i]), dep2str(pool, req), solvid2str(pool, reqq.elements[j])); +#endif + addedge(od, reqq.elements[i], reqq.elements[j], pre == TYPE_PREREQ ? TYPE_PREREQ_P : TYPE_REQ_P); + } + } + } + } + } /* no mixed types, remove all deps on uninstalls */ for (i = j = 0; i < reqq.count; i++) if (pool->solvables[reqq.elements[i]].repo != installed) @@ -678,7 +764,7 @@ addsolvableedges(struct orderdata *od, Solvable *s) if (pool->solvables[p].repo != installed) { #if 0 - printf("add inst edge choice %d (%s -> %s -> %s)\n", choice, solvid2str(pool, p), dep2str(pool, req), solvid2str(pool, p2)); + printf("add inst->inst edge choice %d (%s -> %s -> %s)\n", choice, solvid2str(pool, p), dep2str(pool, req), solvid2str(pool, p2)); #endif addedge(od, p, p2, pre); } @@ -692,6 +778,16 @@ addsolvableedges(struct orderdata *od, Solvable *s) } else { + if (s->repo != installed) + continue; /* no inst->uninst edges, please! */ + + /* uninst -> uninst edge. Those make trouble. Only add if we must */ + if (trans->transaction_installed[p - installed->start] && !havescripts(pool, p)) + { + /* p is obsoleted by another package and has no scripts */ + /* we assume that the obsoletor is good enough to replace p */ + continue; + } #if 1 choice = 0; for (j = 0; j < reqq.count; j++) @@ -745,42 +841,20 @@ addsolvableedges(struct orderdata *od, Solvable *s) queue_free(&reqq); } -static inline int -haveprereq(Pool *pool, Id solvid) -{ - Solvable *s = pool->solvables + solvid; - if (s->requires) - { - Id req, *reqp; - int inpre = 0; - reqp = s->repo->idarraydata + s->requires; - while ((req = *reqp++) != 0) - { - if (req == SOLVABLE_PREREQMARKER) - { - inpre = 1; - continue; - } - if (inpre && strncmp(id2str(pool, req), "rpmlib(", 7) != 0) - return 1; - } - } - return 0; -} -void +/* break an edge in a cycle */ +static void breakcycle(struct orderdata *od, Id *cycle) { Pool *pool = od->trans->pool; Id ddegmin, ddegmax, ddeg; int k, l; - struct transel *te; + struct _TransactionElement *te; l = 0; ddegmin = ddegmax = 0; for (k = 0; cycle[k + 1]; k += 2) { - MAPSET(&od->cycletes, cycle[k]); /* this te is involved in a cycle */ ddeg = od->edgedata[cycle[k + 1] + 1]; if (ddeg > ddegmax) ddegmax = ddeg; @@ -792,7 +866,7 @@ breakcycle(struct orderdata *od, Id *cycle) } if (ddeg == ddegmin) { - if (haveprereq(pool, od->tes[cycle[l]].p) && !haveprereq(pool, od->tes[cycle[k]].p)) + if (havescripts(pool, od->tes[cycle[l]].p) && !havescripts(pool, od->tes[cycle[k]].p)) { /* prefer k, as l comes from a package with contains scriptlets */ l = k; @@ -803,6 +877,23 @@ breakcycle(struct orderdata *od, Id *cycle) } } + /* record brkoen cycle starting with the tail */ + queue_push(&od->cycles, od->cyclesdata.count); /* offset into data */ + queue_push(&od->cycles, k / 2); /* cycle elements */ + queue_push(&od->cycles, od->edgedata[cycle[l + 1] + 1]); /* broken edge */ + od->ncycles++; + for (k = l;;) + { + k += 2; + if (!cycle[k + 1]) + k = 0; + queue_push(&od->cyclesdata, cycle[k]); + if (k == l) + break; + } + queue_push(&od->cyclesdata, 0); /* mark end */ + + /* break that edge */ od->edgedata[cycle[l + 1] + 1] |= TYPE_BROKEN; #if 1 @@ -810,9 +901,8 @@ breakcycle(struct orderdata *od, Id *cycle) return; #endif - /* cycle recorded, print it */ - if ((ddegmax & TYPE_PREREQ) != 0) + if (ddegmin >= TYPE_REQ && (ddegmax & TYPE_PREREQ) != 0) printf("CRITICAL "); printf("cycle: --> "); for (k = 0; cycle[k + 1]; k += 2) @@ -826,6 +916,181 @@ breakcycle(struct orderdata *od, Id *cycle) printf("\n"); } +static inline void +dump_tes(struct orderdata *od) +{ + Pool *pool = od->trans->pool; + int i, j; + Queue obsq; + struct _TransactionElement *te, *te2; + + queue_init(&obsq); + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + { + Solvable *s = pool->solvables + te->p; + printf("TE %4d: %c%s\n", i, s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); + if (s->repo != pool->installed) + { + queue_empty(&obsq); + solver_transaction_all_pkgs(od->trans, te->p, &obsq); + for (j = 0; j < obsq.count; j++) + printf(" -%s\n", solvid2str(pool, obsq.elements[j])); + } + for (j = te->edges; od->edgedata[j]; j += 2) + { + te2 = od->tes + od->edgedata[j]; + printf(" --%x--> TE %4d: %s\n", od->edgedata[j + 1], od->edgedata[j], solvid2str(pool, te2->p)); + } + } +} + +#if 1 +static void +reachable(struct orderdata *od, Id i) +{ + struct _TransactionElement *te = od->tes + i; + int j, k; + + if (te->mark != 0) + return; + te->mark = 1; + for (j = te->edges; (k = od->edgedata[j]) != 0; j += 2) + { + if ((od->edgedata[j + 1] & TYPE_BROKEN) != 0) + continue; + if (!od->tes[k].mark) + reachable(od, k); + if (od->tes[k].mark == 2) + { + te->mark = 2; + return; + } + } + te->mark = -1; +} +#endif + +static void +addcycleedges(struct orderdata *od, Id *cycle, Queue *todo) +{ +#if 0 + Transaction *trans = od->trans; + Pool *pool = trans->pool; +#endif + struct _TransactionElement *te; + int i, j, k, tail; +#if 1 + int head; +#endif + +#if 0 + printf("addcycleedges\n"); + for (i = 0; (j = cycle[i]) != 0; i++) + printf("cycle %s\n", solvid2str(pool, od->tes[j].p)); +#endif + + /* first add all the tail cycle edges */ + + /* see what we can reach from the cycle */ + queue_empty(todo); + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + te->mark = 0; + for (i = 0; (j = cycle[i]) != 0; i++) + { + od->tes[j].mark = -1; + queue_push(todo, j); + } + while (todo->count) + { + i = queue_pop(todo); + te = od->tes + i; + if (te->mark > 0) + continue; + te->mark = te->mark < 0 ? 2 : 1; + for (j = te->edges; (k = od->edgedata[j]) != 0; j += 2) + { + if ((od->edgedata[j + 1] & TYPE_BROKEN) != 0) + continue; + if (od->tes[k].mark > 0) + continue; /* no need to visit again */ + queue_push(todo, k); + } + } + /* now all cycle TEs are marked with 2, all TEs reachable + * from the cycle are marked with 1 */ + tail = cycle[0]; + od->tes[tail].mark = 1; /* no need to add edges */ + + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + { + if (te->mark) + continue; /* reachable from cycle */ + for (j = te->edges; (k = od->edgedata[j]) != 0; j += 2) + { + if ((od->edgedata[j + 1] & TYPE_BROKEN) != 0) + continue; + if (od->tes[k].mark != 2) + continue; + /* We found an edge to the cycle. Add an extra edge to the tail */ + /* the TE was not reachable, so we're not creating a new cycle! */ +#if 0 + printf("adding TO TAIL cycle edge %d->%d %s->%s!\n", i, tail, solvid2str(pool, od->tes[i].p), solvid2str(pool, od->tes[tail].p)); +#endif + j -= te->edges; /* in case we move */ + addteedge(od, i, tail, TYPE_CYCLETAIL); + j += te->edges; + break; /* one edge is enough */ + } + } + +#if 1 + /* now add all head cycle edges */ + + /* reset marks */ + for (i = 1, te = od->tes + i; i < od->ntes; i++, te++) + te->mark = 0; + head = 0; + for (i = 0; (j = cycle[i]) != 0; i++) + { + head = j; + od->tes[j].mark = 2; + } + /* first the head to save some time */ + te = od->tes + head; + for (j = te->edges; (k = od->edgedata[j]) != 0; j += 2) + { + if ((od->edgedata[j + 1] & TYPE_BROKEN) != 0) + continue; + if (!od->tes[k].mark) + reachable(od, k); + if (od->tes[k].mark == -1) + od->tes[k].mark = -2; /* no need for another edge */ + } + for (i = 0; cycle[i] != 0; i++) + { + if (cycle[i] == head) + break; + te = od->tes + cycle[i]; + for (j = te->edges; (k = od->edgedata[j]) != 0; j += 2) + { + if ((od->edgedata[j + 1] & TYPE_BROKEN) != 0) + continue; + /* see if we can reach a cycle TE from k */ + if (!od->tes[k].mark) + reachable(od, k); + if (od->tes[k].mark == -1) + { +#if 0 + printf("adding FROM HEAD cycle edge %d->%d %s->%s [%s]!\n", head, k, solvid2str(pool, od->tes[head].p), solvid2str(pool, od->tes[k].p), solvid2str(pool, od->tes[cycle[i]].p)); +#endif + addteedge(od, head, k, TYPE_CYCLEHEAD); + od->tes[k].mark = -2; /* no need to add that one again */ + } + } + } +#endif +} + void transaction_order(Transaction *trans) { @@ -836,15 +1101,15 @@ transaction_order(Transaction *trans) Solvable *s; int i, j, k, numte, numedge; struct orderdata od; - struct transel *te; + struct _TransactionElement *te; Queue todo, obsq; - int cycstart, cycel, broken; + int cycstart, cycel; Id *cycle, *obstypes; int oldcount; - int now; + int start, now; POOL_DEBUG(SAT_DEBUG_STATS, "ordering transaction\n"); - now = sat_timems(0); + start = now = sat_timems(0); /* create a transaction element for every active component */ numte = 0; for (i = 0; i < tr->count; i += 2) @@ -867,7 +1132,7 @@ transaction_order(Transaction *trans) od.edgedata = sat_extend(0, 0, 1, sizeof(Id), EDGEDATA_BLOCK); od.edgedata[0] = 0; od.nedgedata = 1; - map_init(&od.cycletes, numte); + queue_init(&od.cycles); for (i = 0, te = od.tes + 1; i < tr->count; i += 2) { @@ -877,7 +1142,6 @@ transaction_order(Transaction *trans) continue; te->p = p; te->type = tr->elements[i]; - te->medianr = solvable_lookup_num(s, SOLVABLE_MEDIANR, 0); te++; } @@ -896,10 +1160,13 @@ transaction_order(Transaction *trans) numedge++; POOL_DEBUG(SAT_DEBUG_STATS, "edges: %d, edge space: %d\n", numedge, od.nedgedata / 2); POOL_DEBUG(SAT_DEBUG_STATS, "edge creation took %d ms\n", sat_timems(now)); + +#if 0 + dump_tes(&od); +#endif + now = sat_timems(0); /* kill all cycles */ - broken = 0; - queue_init(&todo); for (i = numte - 1; i > 0; i--) queue_push(&todo, i); @@ -961,8 +1228,8 @@ transaction_order(Transaction *trans) { cycle[k * 2] = cycle[k]; te = od.tes + cycle[k - 1]; - if (te->mark == 1) - te->mark = 0; /* reset investigation marker */ + assert(te->mark == 1); + te->mark = 0; /* reset investigation marker */ /* printf("searching for edge from %d to %d\n", cycle[k - 1], cycle[k]); */ for (j = te->edges; od.edgedata[j]; j += 2) if (od.edgedata[j] == cycle[k]) @@ -973,34 +1240,47 @@ transaction_order(Transaction *trans) /* now cycle looks like this: */ /* te1 edge te2 edge te3 ... teN edge te1 0 */ breakcycle(&od, cycle); - broken++; /* restart with start of cycle */ todo.count = cycstart + 1; } - POOL_DEBUG(SAT_DEBUG_STATS, "cycles broken: %d\n", broken); + POOL_DEBUG(SAT_DEBUG_STATS, "cycles broken: %d\n", od.ncycles); + POOL_DEBUG(SAT_DEBUG_STATS, "cycle breaking took %d ms\n", sat_timems(now)); - /* invert all edges */ - for (i = 1, te = od.tes + i; i < numte; i++, te++) - { - te->invedges = 1; /* term 0 */ - te->mark = 0; /* backref count */ - } + now = sat_timems(0); + /* now go through all broken cycles and create cycle edges to help + the ordering */ + for (i = od.cycles.count - 3; i >= 0; i -= 3) + { + if (od.cycles.elements[i + 2] >= TYPE_REQ) + addcycleedges(&od, od.cyclesdata.elements + od.cycles.elements[i], &todo); + } + for (i = od.cycles.count - 3; i >= 0; i -= 3) + { + if (od.cycles.elements[i + 2] < TYPE_REQ) + addcycleedges(&od, od.cyclesdata.elements + od.cycles.elements[i], &todo); + } + POOL_DEBUG(SAT_DEBUG_STATS, "cycle edge creation took %d ms\n", sat_timems(now)); + /* all edges are finally set up and there are no cycles, now the easy part. + * Create an ordered transaction */ + now = sat_timems(0); + /* first invert all edges */ + for (i = 1, te = od.tes + i; i < numte; i++, te++) + te->mark = 1; /* term 0 */ for (i = 1, te = od.tes + i; i < numte; i++, te++) { for (j = te->edges; od.edgedata[j]; j += 2) { if ((od.edgedata[j + 1] & TYPE_BROKEN) != 0) continue; - struct transel *te2 = od.tes + od.edgedata[j]; - te2->invedges++; + od.tes[od.edgedata[j]].mark++; } } j = 1; for (i = 1, te = od.tes + i; i < numte; i++, te++) { - te->invedges += j; - j = te->invedges; + te->mark += j; + j = te->mark; } POOL_DEBUG(SAT_DEBUG_STATS, "invedge space: %d\n", j + 1); od.invedgedata = sat_calloc(j + 1, sizeof(Id)); @@ -1010,13 +1290,20 @@ transaction_order(Transaction *trans) { if ((od.edgedata[j + 1] & TYPE_BROKEN) != 0) continue; - struct transel *te2 = od.tes + od.edgedata[j]; - od.invedgedata[--te2->invedges] = i; - te->mark++; + od.invedgedata[--od.tes[od.edgedata[j]].mark] = i; } } + for (i = 1, te = od.tes + i; i < numte; i++, te++) + te->edges = te->mark; /* edges now points into invedgedata */ + od.edgedata = sat_free(od.edgedata); + /* now the final ordering */ for (i = 1, te = od.tes + i; i < numte; i++, te++) + te->mark = 0; + for (i = 1, te = od.tes + i; i < numte; i++, te++) + for (j = te->edges; od.invedgedata[j]; j++) + od.tes[od.invedgedata[j]].mark++; + for (i = 1, te = od.tes + i; i < numte; i++, te++) if (te->mark == 0) queue_push(&todo, i); assert(todo.count > 0); @@ -1051,19 +1338,13 @@ transaction_order(Transaction *trans) } } if (i == todo.count) - { - for (i = 0; i < todo.count; i++) - { - j = todo.elements[i]; - if (MAPTST(&od.cycletes, j)) - break; - } - } - if (i == todo.count) - i = 0; + i = 0; te = od.tes + todo.elements[i]; queue_push(tr, te->type); queue_push(tr, te->p); +#if 0 +printf("do %s\n", solvid2str(pool, te->p)); +#endif s = pool->solvables + te->p; if (installed && s->repo != installed) { @@ -1081,24 +1362,187 @@ transaction_order(Transaction *trans) } } } - if (i < todo.count - 1) - memmove(todo.elements + i, todo.elements + i + 1, (todo.count - 1 - i) * sizeof(Id)); - queue_pop(&todo); - for (j = te->invedges; od.invedgedata[j]; j++) + queue_delete(&todo, i); + for (j = te->edges; od.invedgedata[j]; j++) { - struct transel *te2 = od.tes + od.invedgedata[j]; + struct _TransactionElement *te2 = od.tes + od.invedgedata[j]; assert(te2->mark > 0); if (--te2->mark == 0) { queue_push(&todo, od.invedgedata[j]); +#if 0 +printf("free %s\n", solvid2str(pool, od.tes[od.invedgedata[j]].p)); +#endif } } } + sat_free(obstypes); queue_free(&todo); queue_free(&obsq); for (i = 1, te = od.tes + i; i < numte; i++, te++) assert(te->mark == 0); assert(tr->count == oldcount); - POOL_DEBUG(SAT_DEBUG_STATS, "transaction ordering took %d ms\n", sat_timems(now)); + POOL_DEBUG(SAT_DEBUG_STATS, "creating new transaction took %d ms\n", sat_timems(now)); + POOL_DEBUG(SAT_DEBUG_STATS, "transaction ordering took %d ms\n", sat_timems(start)); + + trans->tes = od.tes; + trans->ntes = numte; + trans->invedgedata = od.invedgedata; +} + +static void +transaction_check_pkg(Transaction *trans, Id tepkg, Id pkg, Map *ins, Map *seen, int onlyprereq, Id noconfpkg, int depth) +{ + Pool *pool = trans->pool; + Id p, pp; + Solvable *s; + int good; + + if (MAPTST(seen, pkg)) + return; + MAPSET(seen, pkg); + s = pool->solvables + pkg; +#if 0 + printf("- %*s%c%s\n", depth * 2, "", s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); +#endif + if (s->requires) + { + Id req, *reqp; + int inpre = 0; + reqp = s->repo->idarraydata + s->requires; + while ((req = *reqp++) != 0) + { + if (req == SOLVABLE_PREREQMARKER) + { + inpre = 1; + continue; + } + if (onlyprereq && !inpre) + continue; + if (!strncmp(id2str(pool, req), "rpmlib(", 7)) + continue; + good = 0; + /* first check kept packages, then freshly installed, then not yet uninstalled */ + FOR_PROVIDES(p, pp, req) + { + if (!MAPTST(ins, p)) + continue; + if (MAPTST(&trans->transactsmap, p)) + continue; + good++; + transaction_check_pkg(trans, tepkg, p, ins, seen, 0, noconfpkg, depth + 1); + } + if (!good) + { + FOR_PROVIDES(p, pp, req) + { + if (!MAPTST(ins, p)) + continue; + if (pool->solvables[p].repo == pool->installed) + continue; + good++; + transaction_check_pkg(trans, tepkg, p, ins, seen, 0, noconfpkg, depth + 1); + } + } + if (!good) + { + FOR_PROVIDES(p, pp, req) + { + if (!MAPTST(ins, p)) + continue; + good++; + transaction_check_pkg(trans, tepkg, p, ins, seen, 0, noconfpkg, depth + 1); + } + } + if (!good) + { + printf(" %c%s: nothing provides %s needed by %c%s\n", pool->solvables[tepkg].repo == pool->installed ? '-' : '+', solvid2str(pool, tepkg), dep2str(pool, req), s->repo == pool->installed ? '-' : '+', solvable2str(pool, s)); + } + } + } +} + +void +transaction_check(Transaction *trans) +{ + Pool *pool = trans->pool; + Solvable *s; + Id p, type, lastins; + Map ins, seen; + int i; + + printf("\nchecking transaction order...\n"); + map_init(&ins, pool->nsolvables); + map_init(&seen, pool->nsolvables); + if (pool->installed) + FOR_REPO_SOLVABLES(pool->installed, p, s) + MAPSET(&ins, p); + lastins = 0; + for (i = 0; i < trans->steps.count; i += 2) + { + type = trans->steps.elements[i]; + p = trans->steps.elements[i + 1]; + s = pool->solvables + p; + if (s->repo != pool->installed) + lastins = p; + if (s->repo != pool->installed) + MAPSET(&ins, p); + if (havescripts(pool, p)) + { + MAPZERO(&seen); + transaction_check_pkg(trans, p, p, &ins, &seen, 1, lastins, 0); + } + if (s->repo == pool->installed) + MAPCLR(&ins, p); + } + map_free(&seen); + map_free(&ins); + printf("transaction order check done.\n"); } +int +transaction_add_choices(Transaction *trans, Queue *choices, Id chosen) +{ + int i, j; + struct _TransactionElement *te; + + if (!chosen) + { + /* initialization step */ + for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + te->mark = 0; + for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + { + for (j = te->edges; trans->invedgedata[j]; j++) + trans->tes[trans->invedgedata[j]].mark++; + } + for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + if (!te->mark) + { + queue_push(choices, te->type); + queue_push(choices, te->p); + } + return choices->count; + } + for (i = 1, te = trans->tes + i; i < trans->ntes; i++, te++) + if (te->p == chosen) + break; + if (i == trans->ntes) + return choices->count; + if (te->mark > 0) + { + /* hey! out-of-order installation! */ + te->mark = -1; + } + for (j = te->edges; trans->invedgedata[j]; j++) + { + te = trans->tes + trans->invedgedata[j]; + assert(te->mark > 0 || te->mark == -1); + if (te->mark > 0 && --te->mark == 0) + { + queue_push(choices, te->type); + queue_push(choices, te->p); + } + } + return choices->count; +} diff --git a/src/transaction.h b/src/transaction.h index c1f87b8..ea01d02 100644 --- a/src/transaction.h +++ b/src/transaction.h @@ -23,12 +23,27 @@ extern "C" { struct _Pool; +/* internal */ +struct _TransactionElement { + Id p; /* solvable id */ + Id type; /* installation type */ + Id edges; + Id mark; +}; + typedef struct _Transaction { - struct _Pool *pool; - Queue steps; + struct _Pool *pool; /* back pointer to pool */ + + Queue steps; /* the transaction steps */ + Queue transaction_info; Id *transaction_installed; Map transactsmap; + + struct _TransactionElement *tes; + int ntes; + Id *invedgedata; + } Transaction; @@ -62,6 +77,7 @@ extern void solver_transaction_all_pkgs(Transaction *trans, Id p, Queue *pkgs); extern Id solver_transaction_pkg(Transaction *trans, Id p); extern Id solver_transaction_show(Transaction *trans, Id type, Id p, int mode); extern void transaction_order(Transaction *trans); +extern void transaction_check(Transaction *trans); #ifdef __cplusplus } diff --git a/tests/solver/deptestomatic.c b/tests/solver/deptestomatic.c index 8eccf0e..472d884 100644 --- a/tests/solver/deptestomatic.c +++ b/tests/solver/deptestomatic.c @@ -1533,8 +1533,9 @@ endElement( void *userData, const char *name ) rc_printdownloadsize(solv); } rc_printdecisions(solv, &pd->trials); -#if 0 +#if 1 transaction_order(&solv->trans); + transaction_check(&solv->trans); solver_printdecisions(solv); #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] <zypper> master : - new files with text for translation
by Ján Kupec 08 Jun '09

08 Jun '09

ref: refs/heads/master commit 0b1c03a694ca33ecda204d42c135954232fc4bd6 Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Jun 8 16:44:06 2009 +0200 - new files with text for translation --- po/POTFILES.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 2eb08c1..4246ccc 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,6 +7,7 @@ ../src/callbacks/repo.h ../src/callbacks/rpm.h ../src/Command.cc +../src/Config.cc ../src/info.cc ../src/install.cc ../src/locks.cc @@ -17,7 +18,9 @@ ../src/repos.cc ../src/search.cc ../src/solve-commit.cc +../src/Summary.cc ../src/update.cc +../src/utils/Augeas.cc ../src/utils/getopt.cc ../src/utils/messages.cc ../src/utils/misc.cc -- 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] <zypper> master : Version.
by Ján Kupec 08 Jun '09

08 Jun '09

ref: refs/heads/master commit 275b70ed0d1b86d6ca6f80d71fdb76e94ef0f4c8 Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Jun 8 12:32:14 2009 +0200 Version. --- VERSION.cmake | 4 ++-- package/zypper.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 35eb3b8..66066a4 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -30,8 +30,8 @@ # note in the changes file. # SET(VERSION_MAJOR "1") -SET(VERSION_MINOR "1") -SET(VERSION_PATCH "2") +SET(VERSION_MINOR "2") +SET(VERSION_PATCH "0") # LAST RELEASED: 1.1.1 #======= diff --git a/package/zypper.changes b/package/zypper.changes index 3074f64..d867d27 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jun 8 11:55:57 CEST 2009 - jkupec(a)suse.cz + +- some code cleanup and fixes +- show arch & repo in 'products' +- 1.2.0 + +------------------------------------------------------------------- Thu Jun 4 16:14:17 CEST 2009 - ma(a)suse.de - Adapt to libzypp-6.8.0 api changes. -- 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] <zypper> master : Few words about repositories added.
by Ján Kupec 08 Jun '09

08 Jun '09

ref: refs/heads/master commit d56bd5dbe9f791359b1c17541b9c130533fe70c7 Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Jun 8 12:31:28 2009 +0200 Few words about repositories added. --- doc/zypper.8 | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/doc/zypper.8 b/doc/zypper.8 index f83d3f0..b0a916e 100644 --- a/doc/zypper.8 +++ b/doc/zypper.8 @@ -23,6 +23,10 @@ pattern definitions, etc. These data are stored together with the RPM files in folders called \fBrepositories\fR. Repositories can be placed on various media like an HTTP or FTP server, DVD, or a folder on a local disc. +There is a special set of commands in zypper intented to manipulate repositories. +Also many commands and options take a repository as an arugment. See section +\fBCOMMANDS\fR, subsection \fBRepository Management\fR for more details. + .SS Resource Identfiers (URI) To specify locations of repositories or other resources (RPM files, .repo files) you can use any type of URIs supported by libzypp. See @@ -781,12 +785,27 @@ zypper is able to work with YaST, YUM, and aptrpm repositories, ZENworks 7 Linux Management, ZENworks 6.6.x Linux Management servers, as well as local files. +Repositories are primarily identified using their \fIURI\fR or \fIalias\fR. +Alias serves as a shorthand for the long URI or name of the repository. +The \fIname\fR of the repository should briefly describe the repository and +is shown to the user in tables and messages. The name is not required, and +if not known, the alias is shown instead. The alias is required and +uniquely identifies the repository on the system. + +The \fIalias\fR, \fIURI\fR, or the \fInumber\fR from \fBzypper repos\fR list can be used to +specify a repository as an argument of various zypper commands and +options like \fBrefresh\fR, \fB--repo\fR, or \fB--from\fR. + +Apart from the above, repositories have several other properties which can be +set using the commands described in this section below, or by manually +editing the repository definition files (.repo files, see section FILES). + .TP .B addrepo (ar) [options] <URI> <alias> .TP .B addrepo (ar) [options] <FILE.repo> -Add a new repository specified by URI and assign specified alias to it or specify URI to repo file. +Add a new repository specified by URI and assign specified alias to it or specify URI to a .repo file. Newly added repositories have auto-refresh disabled by default (except for repositories imported from a .repo, having the auto-refresh enabled). To enable auto-refresh, use the @@ -1419,7 +1438,7 @@ This file is used by all ZYpp-based applications. .TP .B /etc/zypp/repos.d Directory containing repository definition (*.repo) files. -You can use the Repository Management Commands to manipulate these files, +You can use the Repository Management commands to manipulate these files, or you can edit them yourself. In either case, after doing the modifications, executing \fBzypper refresh\fR is strongly recommended. -- 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] <zypper> master : Show arch after version.
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit 6272c68e5ffe0e137eeec98107680b8c06635771 Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 16:35:50 2009 +0200 Show arch after version. --- src/search.cc | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/search.cc b/src/search.cc index f634c90..ec819be 100644 --- a/src/search.cc +++ b/src/search.cc @@ -543,8 +543,10 @@ static void list_product_table(Zypper & zypper) // translators: product category (base/addon), the rug term th << _("Category"); else + { + th << _("Arch"); th << _("Is Base"); - th << _("Arch"); + } tbl << th; bool installed_only = zypper.cOpts().count("installed-only"); @@ -590,14 +592,21 @@ static void list_product_table(Zypper & zypper) continue; tr << ""; } + // repository if (!zypper.globalOpts().is_rug_compatible) tr << repo; + // name tr << product->name () << product->edition().asString(); if (zypper.globalOpts().is_rug_compatible) + // rug 'Category' tr << (product->isTargetDistribution() ? "base" : ""); else + { + // architecture + tr << product->arch().asString(); + // is base tr << (product->isTargetDistribution() ? _("Yes") : _("No")); - tr << product->arch().asString(); + } tbl << tr; } } -- 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] <zypper> master : Show to-be-removed and to-change-vendor count in negative color.
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit 7be34cf5c85d3e57abbdc0bbf27769b32ad81ad9 Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 16:34:48 2009 +0200 Show to-be-removed and to-change-vendor count in negative color. --- src/Summary.cc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Summary.cc b/src/Summary.cc index 820dda5..e44df3b 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -678,7 +678,7 @@ void Summary::writePackageCounts(ostream & out) count = i->second.size(); if (gotcha) s << ", "; - fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_HIGHLIGHT); + fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_NEGATIVE); if (gotcha) // translators: this text will be preceded by a number e.g. "5 to ..." s << _PL("to remove", "to remove", count); @@ -693,7 +693,7 @@ void Summary::writePackageCounts(ostream & out) count = i->second.size(); if (gotcha) s << ", "; - fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_HIGHLIGHT); + fprint_color(s, str::form("%d ", count), COLOR_CONTEXT_NEGATIVE); if (gotcha) // translators: this text will be preceded by a number e.g. "5 to ..." s << _PL("to change vendor", " to change vendor", count); -- 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] <zypper> master : Show also repo and arch in products table.
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit ae78f1a7d705f08e806ed47b47c5e3f926310c19 Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 15:55:09 2009 +0200 Show also repo and arch in products table. --- src/search.cc | 69 +++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 48 insertions(+), 21 deletions(-) diff --git a/src/search.cc b/src/search.cc index 89649d9..f634c90 100644 --- a/src/search.cc +++ b/src/search.cc @@ -535,6 +535,8 @@ static void list_product_table(Zypper & zypper) // translators: S for installed Status th << _("S"); + if (!zypper.globalOpts().is_rug_compatible) + th << _("Repository"); th << _("Name"); th << _("Version"); if (zypper.globalOpts().is_rug_compatible) @@ -542,37 +544,62 @@ static void list_product_table(Zypper & zypper) th << _("Category"); else th << _("Is Base"); + th << _("Arch"); tbl << th; bool installed_only = zypper.cOpts().count("installed-only"); bool notinst_only = zypper.cOpts().count("uninstalled-only"); - ResPool::byKind_iterator - it = God->pool().byKindBegin(ResKind::product), - e = God->pool().byKindEnd(ResKind::product); + ResPoolProxy::const_iterator + it = God->pool().proxy().byKindBegin(ResKind::product), + e = God->pool().proxy().byKindEnd(ResKind::product); for (; it != e; ++it ) { - Product::constPtr product = asKind<Product>(it->resolvable()); + ui::Selectable::constPtr s = *it; - TableRow tr; - if (it->status().isInstalled()) - { - if (notinst_only) - continue; - tr << "i"; - } - else + // get the first installed object + PoolItem installed; + if (!s->installedEmpty()) + installed = s->installedObj(); + + // show available objects + for_(it, s->availableBegin(), s->availableEnd()) { - if (installed_only) - continue; - tr << ""; + Product::constPtr product = asKind<Product>(it->resolvable()); + TableRow tr; + zypp::PoolItem pi = *it; + string repo = product->repoInfo().name(); + + if (installed) + { + if (notinst_only) + continue; + if (equalNVRA(*installed.resolvable(), *pi.resolvable())) + { + tr << "i"; + // this is needed, other isTargetDistribution would not return + // true for the installed base product + product = asKind<Product>(installed); + } + else + tr << "v"; + } + else + { + if (installed_only) + continue; + tr << ""; + } + if (!zypper.globalOpts().is_rug_compatible) + tr << repo; + tr << product->name () << product->edition().asString(); + if (zypper.globalOpts().is_rug_compatible) + tr << (product->isTargetDistribution() ? "base" : ""); + else + tr << (product->isTargetDistribution() ? _("Yes") : _("No")); + tr << product->arch().asString(); + tbl << tr; } - tr << product->name () << product->edition().asString(); - if (zypper.globalOpts().is_rug_compatible) - tr << (product->isTargetDistribution() ? "base" : ""); - else - tr << (product->isTargetDistribution() ? _("Yes") : _("No")); - tbl << tr; } tbl.sort(1); // Name -- 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] <zypper> master : Remove deprecated zypp::Product::type() calls.
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit 2ce0a422ca97ad72e6936ca768e7fc4f5b4a35af Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 15:23:25 2009 +0200 Remove deprecated zypp::Product::type() calls. - Is Base: Yes/No is shown instead - in rug mode, Category: base/(empty) is shown --- src/info.cc | 12 ++++++++---- src/search.cc | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/info.cc b/src/info.cc index a3bccb6..92ff694 100644 --- a/src/info.cc +++ b/src/info.cc @@ -399,10 +399,14 @@ void printProductInfo(Zypper & zypper, const ui::Selectable & s) printNVA(pool_item.resolvable()); Product::constPtr product = asKind<Product>(pool_item.resolvable()); - cout << _("Category") << ": " << product->type() << endl; - cout << _("Flavor") << ": " << product->flavor() << endl; - cout << _("Installed") << ": " << (pool_item.status().isInstalled() ? "Yes" : "No") << endl; - cout << _("Short Name") << ": " << product->shortName() << endl; + cout << _("Is Base") << ": " + << (product->isTargetDistribution() ? _("Yes") : _("No")) << endl; + cout << _("Flavor") << ": " + << product->flavor() << endl; + cout << _("Installed") << ": " + << (pool_item.status().isInstalled() ? _("Yes") : _("No")) << endl; + cout << _("Short Name") + << ": " << product->shortName() << endl; printSummaryDesc(pool_item.resolvable()); } } diff --git a/src/search.cc b/src/search.cc index 24a69b2..89649d9 100644 --- a/src/search.cc +++ b/src/search.cc @@ -538,11 +538,10 @@ static void list_product_table(Zypper & zypper) th << _("Name"); th << _("Version"); if (zypper.globalOpts().is_rug_compatible) - // translators: product category (the rug term) + // translators: product category (base/addon), the rug term th << _("Category"); else - // translators: product type (addon/base) (rug calls it Category) - th << _("Type"); + th << _("Is Base"); tbl << th; bool installed_only = zypper.cOpts().count("installed-only"); @@ -569,7 +568,10 @@ static void list_product_table(Zypper & zypper) tr << ""; } tr << product->name () << product->edition().asString(); - tr << product->type(); + if (zypper.globalOpts().is_rug_compatible) + tr << (product->isTargetDistribution() ? "base" : ""); + else + tr << (product->isTargetDistribution() ? _("Yes") : _("No")); tbl << tr; } tbl.sort(1); // Name -- 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] <zypper> master : Do not colorize summary output when viewing in pager
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit f929ec7a5ef489da8c1654a05300fef43a829775 Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 12:34:25 2009 +0200 Do not colorize summary output when viewing in pager --- src/Summary.cc | 13 ++++++++++++- src/Summary.h | 3 +++ src/Zypper.h | 2 +- src/solve-commit.cc | 2 ++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/Summary.cc b/src/Summary.cc index 00f46bb..820dda5 100644 --- a/src/Summary.cc +++ b/src/Summary.cc @@ -20,6 +20,7 @@ #include "utils/colors.h" #include "utils/misc.h" #include "Table.h" +#include "Zypper.h" #include "Summary.h" @@ -38,7 +39,7 @@ bool Summary::ResPairNameCompare::operator()( // -------------------------------------------------------------------------- Summary::Summary(const zypp::ResPool & pool, const ViewOptions options) - : _viewop(options), _wrap_width(80) + : _viewop(options), _wrap_width(80), _force_no_color(false) { readPool(pool); } @@ -724,6 +725,16 @@ void Summary::writePackageCounts(ostream & out) void Summary::dumpTo(ostream & out) { + struct SetColor + { + SetColor(bool force) : docolors(Zypper::instance()->config().do_colors) + { if (force) Zypper::instance()->config().do_colors = false; } + ~SetColor() + { Zypper::instance()->config().do_colors = docolors; } + bool docolors; + }; + SetColor setcolor(_force_no_color); + _wrap_width = get_screen_width(); writeNewlyInstalled(out); diff --git a/src/Summary.h b/src/Summary.h index 44afcec..7cada03 100644 --- a/src/Summary.h +++ b/src/Summary.h @@ -62,6 +62,8 @@ public: { _viewop = (ViewOptions) (_viewop & ~option); } void toggleViewOption(const ViewOptions option) { _viewop & option ? unsetViewOption(option) : setViewOption(option); } + void setForceNoColor(bool value = true) + { _force_no_color = value; } void writeNewlyInstalled(std::ostream & out); void writeRemoved(std::ostream & out); @@ -102,6 +104,7 @@ private: private: ViewOptions _viewop; mutable unsigned _wrap_width; + bool _force_no_color; bool _need_reboot; bool _need_restart; diff --git a/src/Zypper.h b/src/Zypper.h index 0eead52..ad37aef 100644 --- a/src/Zypper.h +++ b/src/Zypper.h @@ -162,7 +162,7 @@ public: // setters & getters Out & out(); - const Config & config() const { return _config; } + Config & config() { return _config; } const GlobalOptions & globalOpts() const { return _gopts; } const parsed_opts & cOpts() const { return _copts; } const ZypperCommand & command() const { return _command; } diff --git a/src/solve-commit.cc b/src/solve-commit.cc index 5237ca8..4969129 100755 --- a/src/solve-commit.cc +++ b/src/solve-commit.cc @@ -552,7 +552,9 @@ void solve_and_commit (Zypper & zypper) case 8: // g - view in pager { ostringstream s; + summary.setForceNoColor(true); summary.dumpTo(s); + summary.setForceNoColor(false); show_text_in_pager(s.str()); break; } -- 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] <zypper> master : got rid of signed/unsigned comparison warning
by Ján Kupec 07 Jun '09

07 Jun '09

ref: refs/heads/master commit 0ce4ff091a256ebe8836ae08b393cb7562b61ecc Author: Ján Kupec <jkupec(a)suse.cz> Date: Sun Jun 7 11:35:51 2009 +0200 got rid of signed/unsigned comparison warning --- src/Table.cc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Table.cc b/src/Table.cc index f9c3005..e2cf05e 100644 --- a/src/Table.cc +++ b/src/Table.cc @@ -79,9 +79,10 @@ void TableRow::dumpTo (ostream &stream, const Table & parent) const // table is wider than screen parent._width > parent._screen_width && ( // the next table column would exceed the screen size - curpos + parent._max_width[c] + (parent._style != none ? 2 : 3) > parent._screen_width || + curpos + (int) parent._max_width[c] + (parent._style != none ? 2 : 3) > + parent._screen_width || // or the user wishes to first break after the previous column - parent._force_break_after == c - 1); + parent._force_break_after == (int) (c - 1)); if (do_wrap) { -- 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] <libzypp> master : changes 6.8.1
by Michael Andres 05 Jun '09

05 Jun '09

ref: refs/heads/master commit 8aa507911d778546ffd8b527c233d9983dae3cb0 Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 5 21:23:26 2009 +0200 changes 6.8.1 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 3d26667..248050c 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,8 +61,8 @@ SET(LIBZYPP_MAJOR "6") SET(LIBZYPP_COMPATMINOR "8") SET(LIBZYPP_MINOR "8") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") # -# LAST RELEASED: 6.8.0 (8) +# LAST RELEASED: 6.8.1 (8) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 6e7525e..ed24057 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,3 +1,8 @@ +Fri Jun 5 21:16:45 CEST 2009 - ma(a)suse.de + +- Fix solver to use IdSting to avoid failing vendor checks. +- version 6.8.1 (8) + ------------------------------------------------------------------- Thu Jun 4 14:22:58 CEST 2009 - ma(a)suse.de -- 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] <libzypp> master : Fix id to string conversions esp. in vendorchecks as they were buggy.
by Michael Andres 05 Jun '09

05 Jun '09

ref: refs/heads/master commit a1973f8ae837cb6816ec58d9fc99543b1865af32 Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 5 21:14:43 2009 +0200 Fix id to string conversions esp. in vendorchecks as they were buggy. --- zypp/solver/detail/SATResolver.cc | 121 ++++++++++++++++-------------------- 1 files changed, 54 insertions(+), 67 deletions(-) diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index e8c3df7..c5446c3 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -29,7 +29,6 @@ extern "C" #include <satsolver/queue.h> } -#include <sstream> #include "zypp/solver/detail/Helper.h" #include "zypp/base/String.h" #include "zypp/Capability.h" @@ -71,36 +70,26 @@ IMPL_PTR_TYPE(SATResolver); //--------------------------------------------------------------------------- int vendorCheck (Pool *pool, Solvable *solvable1, Solvable *solvable2) { -// DBG << "vendorCheck: " << id2str(pool, solvable1->vendor) << " <--> " << id2str(pool, solvable1->vendor) << endl; - return VendorAttr::instance().equivalent(id2str(pool, solvable1->vendor), id2str(pool, solvable2->vendor)) ? 0:1; +// DBG << "vendorCheck: " << IdString(solvable1->vendor) << " <--> " << IdString(solvable2->vendor) << endl; + return VendorAttr::instance().equivalent( IdString(solvable1->vendor).asString(), + IdString(solvable2->vendor).asString() ) ? 0 : 1; } -string -itemToString (PoolItem item, bool shortVersion) +inline std::string itemToString( const PoolItem & item ) { - ostringstream os; - if (!item) return ""; - - if (item->kind() != ResKind::package) - os << item->kind() << ':'; - os << item->name(); - if (!shortVersion) { - os << '-' << item->edition(); - if (item->arch() != "") { - os << '.' << item->arch(); - } - Repository s = item->repository(); - if (s) { - string alias = s.info().alias(); - if (!alias.empty() - && alias != "@system") - { - os << '[' << s.info().alias() << ']'; - } - } - } - return os.str(); + if ( !item ) + return std::string(); + + sat::Solvable slv( item.satSolvable() ); + std::string ret( slv.asString() ); // n-v-r.a + if ( ! slv.isSystem() ) + { + ret += "["; + ret += slv.repository().alias(); + ret += "]"; + } + return ret; } @@ -926,15 +915,15 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI { case SOLVER_PROBLEM_DISTUPGRADE_RULE: s = mapSolvable (source); - ret = str::form (_("%s does not belong to a distupgrade repository"), solvable2str(pool, s.get())); + ret = str::form (_("%s does not belong to a distupgrade repository"), s.asString().c_str()); break; case SOLVER_PROBLEM_INFARCH_RULE: s = mapSolvable (source); - ret = str::form (_("%s has inferior architecture"), solvable2str(pool, s.get())); + ret = str::form (_("%s has inferior architecture"), s.asString().c_str()); break; case SOLVER_PROBLEM_UPDATE_RULE: s = mapSolvable (source); - ret = str::form (_("problem with installed package %s"), solvable2str(pool, s.get())); + ret = str::form (_("problem with installed package %s"), s.asString().c_str()); break; case SOLVER_PROBLEM_JOB_RULE: ret = _("conflicting requests"); @@ -948,30 +937,30 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI break; case SOLVER_PROBLEM_NOT_INSTALLABLE: s = mapSolvable (source); - ret = str::form (_("%s is not installable"), solvable2str(pool, s.get())); + ret = str::form (_("%s is not installable"), s.asString().c_str()); break; case SOLVER_PROBLEM_NOTHING_PROVIDES_DEP: s = mapSolvable (source); - ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), solvable2str(pool, s.get())); + ret = str::form (_("nothing provides %s needed by %s"), dep2str(pool, dep), s.asString().c_str()); break; case SOLVER_PROBLEM_SAME_NAME: s = mapSolvable (source); s2 = mapSolvable (target); - ret = str::form (_("cannot install both %s and %s"), solvable2str(pool, s.get()), solvable2str(pool, s2.get())); + ret = str::form (_("cannot install both %s and %s"), s.asString().c_str(), s2.asString().c_str()); break; case SOLVER_PROBLEM_PACKAGE_CONFLICT: s = mapSolvable (source); s2 = mapSolvable (target); - ret = str::form (_("%s conflicts with %s provided by %s"), solvable2str(pool, s.get()), dep2str(pool, dep), solvable2str(pool, s2.get())); + ret = str::form (_("%s conflicts with %s provided by %s"), s.asString().c_str(), dep2str(pool, dep), s2.asString().c_str()); break; case SOLVER_PROBLEM_PACKAGE_OBSOLETES: s = mapSolvable (source); s2 = mapSolvable (target); - ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s.get()), dep2str(pool, dep), solvable2str(pool, s2.get())); + ret = str::form (_("%s obsoletes %s provided by %s"), s.asString().c_str(), dep2str(pool, dep), s2.asString().c_str()); break; case SOLVER_PROBLEM_SELF_CONFLICT: s = mapSolvable (source); - ret = str::form (_("solvable %s conflicts with %s provided by itself"), solvable2str(pool, s.get()), dep2str(pool, dep)); + ret = str::form (_("solvable %s conflicts with %s provided by itself"), s.asString().c_str(), dep2str(pool, dep)); break; case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE: ignoreId = source; // for setting weak dependencies @@ -1003,14 +992,14 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI } } - ret = str::form (_("%s requires %s, but this requirement cannot be provided"), solvable2str(pool, s.get()), dep2str(pool, dep)); + ret = str::form (_("%s requires %s, but this requirement cannot be provided"), s.asString().c_str(), dep2str(pool, dep)); if (providerlistInstalled.size() > 0) { detail += _("deleted providers: "); for (ProviderList::const_iterator iter = providerlistInstalled.begin(); iter != providerlistInstalled.end(); iter++) { if (iter == providerlistInstalled.begin()) - detail += itemToString (*iter, false); + detail += itemToString( *iter ); else - detail += "\n " + itemToString (mapItem(*iter), false); + detail += "\n " + itemToString( mapItem(*iter) ); } } if (providerlistUninstalled.size() > 0) { @@ -1020,9 +1009,9 @@ string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI detail = _("uninstallable providers: "); for (ProviderList::const_iterator iter = providerlistUninstalled.begin(); iter != providerlistUninstalled.end(); iter++) { if (iter == providerlistUninstalled.begin()) - detail += itemToString (*iter, false); + detail += itemToString( *iter ); else - detail += "\n " + itemToString (mapItem(*iter), false); + detail += "\n " + itemToString( mapItem(*iter) ); } } break; @@ -1074,18 +1063,17 @@ SATResolver::problems () if (poolItem) { if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, REMOVE); - string description = str::form (_("do not keep %s installed"), solvable2str(pool, s.get()) ); + string description = str::form (_("do not keep %s installed"), s.asString().c_str() ); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("do not install %s"), solvable2str(pool, s.get())); + string description = str::form (_("do not install %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" - << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) << endl; + ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << s.asString() << endl; } } break; @@ -1095,18 +1083,17 @@ SATResolver::problems () if (poolItem) { if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("keep %s"), solvable2str(pool, s.get())); + string description = str::form (_("keep %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, UNLOCK); - string description = str::form (_("do not forbid installation of %s"), itemToString(poolItem, false).c_str()); + string description = str::form (_("do not forbid installation of %s"), itemToString( poolItem ).c_str()); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << "SOLVER_ERASE_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << - id2str(pool, s.get()->arch) << endl; + ERR << "SOLVER_ERASE_SOLVABLE: No item found for " << s.asString() << endl; } } break; @@ -1193,15 +1180,14 @@ SATResolver::problems () if (poolItem) { if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("do not install most recent version of %s"), solvable2str(pool, s.get())); + string description = str::form (_("do not install most recent version of %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } else { ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE " << poolItem << " is not selected for installation" << endl; } } else { - ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE: No item found for " << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << - id2str(pool, s.get()->arch) << endl; + ERR << "SOLVER_INSTALL_SOLVABLE_UPDATE: No item found for " << s.asString() << endl; } } break; @@ -1215,12 +1201,12 @@ SATResolver::problems () PoolItem poolItem = _pool.find (s); if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("keep %s despite the inferior architecture"), solvable2str(pool, s.get())); + string description = str::form (_("keep %s despite the inferior architecture"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, INSTALL); - string description = str::form (_("install %s despite the inferior architecture"), solvable2str(pool, s.get())); + string description = str::form (_("install %s despite the inferior architecture"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } @@ -1229,12 +1215,12 @@ SATResolver::problems () PoolItem poolItem = _pool.find (s); if (_solv->installed && s.get()->repo == _solv->installed) { problemSolution->addSingleAction (poolItem, KEEP); - string description = str::form (_("keep obsolete %s"), solvable2str(pool, s.get())); + string description = str::form (_("keep obsolete %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } else { problemSolution->addSingleAction (poolItem, INSTALL); - string description = str::form (_("install %s from excluded repository"), solvable2str(pool, s.get())); + string description = str::form (_("install %s from excluded repository"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } @@ -1250,12 +1236,11 @@ SATResolver::problems () PoolItem poolItem = _pool.find (s); if (poolItem) { problemSolution->addSingleAction (poolItem, LOCK); // for solver reason: NOT weak lock. - string description = str::form (_("keep %s"), solvable2str(pool, s.get())); + string description = str::form (_("keep %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } else { - ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << id2str(pool, s.get()->name) << "-" - << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) << endl; + ERR << "SOLVER_INSTALL_SOLVABLE: No item found for " << s.asString() << endl; } } else if (rp) @@ -1268,7 +1253,7 @@ SATResolver::problems () if (evrcmp(pool, s.get()->evr, sd.get()->evr, EVRCMP_COMPARE ) > 0) { - string description = str::form (_("downgrade of %s to %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); + string description = str::form (_("downgrade of %s to %s"), s.asString().c_str(), sd.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; @@ -1276,7 +1261,7 @@ SATResolver::problems () if (!_solv->allowarchchange && s.get()->name == sd.get()->name && s.get()->arch != sd.get()->arch && policy_illegal_archchange(_solv, s.get(), sd.get())) { - string description = str::form (_("architecture change of %s to %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); + string description = str::form (_("architecture change of %s to %s"), s.asString().c_str(), sd.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; @@ -1284,27 +1269,29 @@ SATResolver::problems () if (!_solv->allowvendorchange && s.get()->name == sd.get()->name && s.get()->vendor != sd.get()->vendor && policy_illegal_vendorchange(_solv, s.get(), sd.get())) { + IdString s_vendor( s.vendor() ); + IdString sd_vendor( sd.vendor() ); string description = str::form (_("install %s (with vendor change)\n %s\n-->\n %s") , - solvable2str(pool, sd.get()) , id2str(pool, s.get()->vendor), - string(sd.get()->vendor ? id2str(pool, sd.get()->vendor) : " (no vendor) ").c_str() ); + sd.asString().c_str(), + ( s_vendor ? s_vendor.c_str() : " (no vendor) " ), + ( sd_vendor ? sd_vendor.c_str() : " (no vendor) " ) ); MIL << description << endl; problemSolution->addDescription (description); gotone = 1; } if (!gotone) { - string description = str::form (_("replacement of %s with %s"), solvable2str(pool, s.get()), solvable2str(pool, sd.get())); + string description = str::form (_("replacement of %s with %s"), s.asString().c_str(), sd.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); } } else { - ERR << id2str(pool, s.get()->name) << "-" << id2str(pool, s.get()->evr) << "." << id2str(pool, s.get()->arch) - << " or " << id2str(pool, sd.get()->name) << "-" << id2str(pool, sd.get()->evr) << "." << id2str(pool, sd.get()->arch) << " not found" << endl; + ERR << s.asString() << " or " << sd.asString() << " not found" << endl; } } else { if (itemFrom) { - string description = str::form (_("deinstallation of %s"), solvable2str(pool, s.get())); + string description = str::form (_("deinstallation of %s"), s.asString().c_str()); MIL << description << endl; problemSolution->addDescription (description); problemSolution->addSingleAction (itemFrom, REMOVE); -- 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] <sat-solver> master : - added missing dbenv to db_create call
by Michael Schroeder 05 Jun '09

05 Jun '09

ref: refs/heads/master commit 4a6e2530d8780750aa50b9003e497f9d272e998d Author: Michael Schroeder <mls(a)suse.de> Date: Fri Jun 5 18:47:11 2009 +0200 - added missing dbenv to db_create call --- tools/repo_rpmdb.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/repo_rpmdb.c b/tools/repo_rpmdb.c index 657daa3..bdd58d2 100644 --- a/tools/repo_rpmdb.c +++ b/tools/repo_rpmdb.c @@ -1543,7 +1543,7 @@ repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir, int flags) } if (!db) { - if (db_create(&db, 0, 0)) + if (db_create(&db, dbenv, 0)) { perror("db_create"); exit(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] <libzypp> SuSE-SLE-10-SP2-Branch : changes 2.32.4
by Michael Andres 05 Jun '09

05 Jun '09

ref: refs/heads/SuSE-SLE-10-SP2-Branch commit f15635a4bd8a1cfa1001acbb45cf82ed8b548fcd Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 5 16:27:56 2009 +0200 changes 2.32.4 --- VERSION | 2 +- package/libzypp.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index 2ba9a71..c03f894 100644 --- a/VERSION +++ b/VERSION @@ -49,5 +49,5 @@ dnl ================================================== m4_define([LIBZYPP_MINOR], [32]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [3]) +m4_define([LIBZYPP_PATCH], [4]) dnl ================================================== diff --git a/package/libzypp.changes b/package/libzypp.changes index d9d0302..ea1cbfc 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 5 16:25:25 CEST 2009 - ma(a)suse.de + +- Don't reject modalias dependencies with "op edition" part. (bnc #505627) +- version 2.32.4 + +------------------------------------------------------------------- Mon Jul 7 12:38:04 CEST 2008 - ma(a)suse.de - Let libzypp-devel package require libzypp by version. (bnc #405032) -- 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] <libzypp> SuSE-SLE-10-SP2-Branch : Don't reject modalias dependencies with "op edition" part. (bnc #505627)
by Michael Andres 05 Jun '09

05 Jun '09

ref: refs/heads/SuSE-SLE-10-SP2-Branch commit 99126df41cecf6a2dcd8d698e803db8e95563503 Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 5 16:21:45 2009 +0200 Don't reject modalias dependencies with "op edition" part. (bnc #505627) --- zypp/CapFactory.cc | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/zypp/CapFactory.cc b/zypp/CapFactory.cc index 614243b..f3a6eb2 100644 --- a/zypp/CapFactory.cc +++ b/zypp/CapFactory.cc @@ -344,11 +344,6 @@ namespace zypp Rel op_r = Rel::ANY, const std::string & value_r = std::string() ) { - if ( op_r != Rel::ANY ) - { - ZYPP_THROW( Exception("Unsupported kind of Modalias Capability '" + op_r.asString() + "'") ); - } - //split: modalias(name) [op string] static const str::regex rx( "modalias\\(([^)]*)\\)" ); str::smatch what; @@ -357,7 +352,7 @@ namespace zypp // Modalias always refers to 'System' kind of Resolvable. return usetInsert ( new capability::ModaliasCap( ResTraits<SystemResObject>::kind, - what[1].str() ) ); + what[1].str(), op_r, value_r ) ); } // otherwise ZYPP_THROW( Exception("Unsupported kind of Modalias Capability'" + name_r + "'") ); -- 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] <libzypp> SuSE-SLE-10-SP3-Branch : changes 2.100.1
by Michael Andres 05 Jun '09

05 Jun '09

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit daac1d64dc078b1b7f83f94bd73d83d97359aa06 Author: Michael Andres <ma(a)suse.de> Date: Fri Jun 5 16:22:00 2009 +0200 changes 2.100.1 --- VERSION | 2 +- package/libzypp.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION b/VERSION index 1e16a0d..716ad09 100644 --- a/VERSION +++ b/VERSION @@ -49,5 +49,5 @@ dnl ================================================== m4_define([LIBZYPP_MINOR], [100]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== diff --git a/package/libzypp.changes b/package/libzypp.changes index fe6bb01..cdd0e56 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 5 16:11:06 CEST 2009 - ma(a)suse.de + +- Don't reject modalias dependencies with "op edition" part. (bnc #505627) +- version 2.100.1 + +------------------------------------------------------------------- Mon Apr 6 19:24:03 CEST 2009 - jkupec(a)suse.cz - Read .curlrc more robustly (bnc #410750, bnc #330351, bnc #331038) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0