Author: mlschroe Date: Thu Oct 9 15:00:46 2008 New Revision: 11280 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11280&view=rev Log: - oops, forgot bindings Modified: trunk/sat-solver/bindings/dataiterator.i trunk/sat-solver/bindings/repokey.i trunk/sat-solver/bindings/satsolver.i trunk/sat-solver/tools/dumpsolv.c trunk/sat-solver/tools/repo_updateinfoxml.c trunk/sat-solver/tools/repo_write.c Modified: trunk/sat-solver/bindings/dataiterator.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/dataiterator.i?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/bindings/dataiterator.i (original) +++ trunk/sat-solver/bindings/dataiterator.i Thu Oct 9 15:00:46 2008 @@ -16,7 +16,7 @@ %constant int SEARCH_NOCASE = SEARCH_NOCASE; %constant int SEARCH_NO_STORAGE_SOLVABLE = SEARCH_NO_STORAGE_SOLVABLE; - %constant int SEARCH_EXTRA = SEARCH_EXTRA; + %constant int SEARCH_SUB = SEARCH_SUB; %constant int SEARCH_ALL_REPOS = SEARCH_ALL_REPOS; %constant int SEARCH_SKIP_KIND = SEARCH_SKIP_KIND; @@ -39,7 +39,7 @@ return di; } - ~Dataiterator() { free( $self ); } + ~Dataiterator() { dataiterator_free($self); free( $self ); } XSolvable *solvable() { @@ -84,11 +84,6 @@ return dataiterator_step( $self ); } - int match(const char *value, int flags) - { - return dataiterator_match($self, flags, value); - } - void skip_attr() { dataiterator_skip_attribute($self); Modified: trunk/sat-solver/bindings/repokey.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/repokey.i?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/bindings/repokey.i (original) +++ trunk/sat-solver/bindings/repokey.i Thu Oct 9 15:00:46 2008 @@ -23,7 +23,8 @@ %constant int REPOKEY_TYPE_MD5 = REPOKEY_TYPE_MD5; %constant int REPOKEY_TYPE_SHA1 = REPOKEY_TYPE_SHA1; %constant int REPOKEY_TYPE_SHA256 = REPOKEY_TYPE_SHA256; -%constant int REPOKEY_TYPE_COUNTED = REPOKEY_TYPE_COUNTED; +%constant int REPOKEY_TYPE_FIXARRAY = REPOKEY_TYPE_FIXARRAY; +%constant int REPOKEY_TYPE_FLEXARRAY = REPOKEY_TYPE_FLEXARRAY; /* no explicit constructor, Repokey is embedded in Repodata */ @@ -104,7 +105,10 @@ case REPOKEY_TYPE_SHA256: type = Swig_Type_String; break; - case REPOKEY_TYPE_COUNTED: + case REPOKEY_TYPE_FIXARRAY: + type = Swig_Type_Number; + break; + case REPOKEY_TYPE_FLEXARRAY: type = Swig_Type_Number; break; } Modified: trunk/sat-solver/bindings/satsolver.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/satsolver.i?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/bindings/satsolver.i (original) +++ trunk/sat-solver/bindings/satsolver.i Thu Oct 9 15:00:46 2008 @@ -215,8 +215,9 @@ else fprintf(stderr, "REPOKEY_TYPE_{MD5,SHA1,SHA256}: without repodata\n"); break; - case REPOKEY_TYPE_COUNTED: - value = Swig_String( di->kv.eof == 0 ? "open" : di->kv.eof == 1 ? "next" : "close" ); + case REPOKEY_TYPE_FIXARRAY: + case REPOKEY_TYPE_FLEXARRAY: + value = Swig_String( di->kv.eof == 0 ? "element" : "sentinel" ); break; default: fprintf(stderr, "Unhandled type %d\n", di->key->type); Modified: trunk/sat-solver/tools/dumpsolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/dumpsolv.c?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/tools/dumpsolv.c (original) +++ trunk/sat-solver/tools/dumpsolv.c Thu Oct 9 15:00:46 2008 @@ -72,7 +72,7 @@ int indent = 0; keyname = id2str(repo->pool, key->name); - for (kvp = kv; (kvp = kvp->path) != 0; indent += 2) + for (kvp = kv; (kvp = kvp->parent) != 0; indent += 2) printf(" "); switch(key->type) { Modified: trunk/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_updateinfoxml.c (original) +++ trunk/sat-solver/tools/repo_updateinfoxml.c Thu Oct 9 15:00:46 2008 @@ -361,7 +361,7 @@ { const char *arch = 0, *name = 0, *src = 0; Id evr = makeevr_atts(pool, pd, atts); /* parse "epoch", "version", "release" */ - Id n, a; + Id n, a = 0; Id rel_id; for (; *atts; atts += 2) @@ -375,13 +375,14 @@ } /* generated Id for name */ n = str2id(pool, name, 1); + rel_id = n; if (arch) { /* generate Id for arch and combine with name */ a = str2id(pool, arch, 1); - n = rel2id(pool, n, a, REL_ARCH, 1); + rel_id = rel2id(pool, n, a, REL_ARCH, 1); } - rel_id = rel2id(pool, n, evr, REL_LT, 1); + rel_id = rel2id(pool, rel_id, evr, REL_LT, 1); solvable->conflicts = repo_addid_dep(pd->repo, solvable->conflicts, rel_id, 0); Modified: trunk/sat-solver/tools/repo_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_write.c?rev=11280&r1=11279&r2=11280&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_write.c (original) +++ trunk/sat-solver/tools/repo_write.c Thu Oct 9 15:00:46 2008 @@ -862,7 +862,7 @@ data_addid(xd, kv->num); if (!kv->eof) data_addid(xd, cbdata->subschemata[cbdata->current_sub++]); - if (xd == cbdata->extdata + 0 && !kv->path && !cbdata->doingsolvables) + if (xd == cbdata->extdata + 0 && !kv->parent && !cbdata->doingsolvables) { if (xd->len - cbdata->lastlen > cbdata->maxdata) cbdata->maxdata = xd->len - cbdata->lastlen; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org