Author: mlandres Date: Tue Sep 30 13:05:26 2008 New Revision: 11214 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11214&view=rev Log: - repo_content.c: fix broken dependency parsing. Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=11214&r1=11213&r2=11214&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Tue Sep 30 13:05:26 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 30 13:03:10 CEST 2008 - ma@suse.de + +- repo_content.c: fix broken dependency parsing. +- revision 11214 + +------------------------------------------------------------------- Mon Sep 29 14:53:09 CEST 2008 - ma@suse.de - rpms2solv failed to write out most solvable data (bnc #422338). Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?rev=11214&r1=11213&r2=11214&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Tue Sep 30 13:05:26 2008 @@ -118,6 +118,7 @@ /* * add dependency to pool + * OBSOLETES product:SUSE_LINUX product:openSUSE < 11.0 package:openSUSE < 11.0 */ static unsigned int @@ -125,7 +126,7 @@ { char *name; Id id; - + while ((name = splitword(&line)) != 0) { /* Hack, as the content file adds 'package:' for package @@ -133,7 +134,7 @@ if (!strncmp (name, "package:", 8)) name += 8; id = str2id(pool, name, 1); - if (strpbrk(line, "<>=")) + if (strpbrk(line, "<>=") == line) /* next(!) word is rel */ { char *rel = splitword(&line); char *evr = splitword(&line); @@ -214,11 +215,11 @@ we use the first architecture in BASEARCHS or noarch for the product. At the end we create (clone) the product for each one of the remaining architectures - we allow max 4 archs + we allow max 4 archs */ unsigned int numotherarchs = 0; Id *otherarchs = 0; - + memset(&pd, 0, sizeof(pd)); line = sat_malloc(1024); aline = 1024; @@ -256,7 +257,7 @@ /* expect "key value" lines */ value = line; key = splitword(&value); - + if (key) { #if 0 @@ -419,7 +420,7 @@ if (code10) s->supplements = repo_fix_supplements(repo, s->provides, s->supplements, 0); } - + /* now for every other arch, clone the product except the architecture */ for (i = 0; i < numotherarchs; ++i) { @@ -438,7 +439,7 @@ /* now merge the attributes */ repodata_merge_attrs(data, p - pool->solvables - repo->start, s - pool->solvables- repo->start); } - + if (data) repodata_internalize(data); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org