Author: mlschroe Date: Thu Oct 9 15:05:57 2008 New Revision: 11281 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11281&view=rev Log: - grr, why on earth do the bindings have a loadcallback? Modified: trunk/sat-solver/bindings/pool.i trunk/sat-solver/testsuite/yps.c trunk/sat-solver/tools/mergesolv.c Modified: trunk/sat-solver/bindings/pool.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/pool.i?rev=11281&r1=11280&r2=11281&view=diff ============================================================================== --- trunk/sat-solver/bindings/pool.i (original) +++ trunk/sat-solver/bindings/pool.i Thu Oct 9 15:05:57 2008 @@ -11,10 +11,11 @@ poolloadcallback( Pool *pool, Repodata *data, void *vdata ) { FILE *fp = 0; - if (data->location) { - fp = fopen( data->location, "r" ); + const char *location = repodata_lookup_str(data, REPOENTRY_META, REPOSITORY_LOCATION); + if (location) { + fp = fopen(location, "r"); if (!fp) - fprintf( stderr, "*** failed reading %s\n", data->location ); + fprintf( stderr, "*** failed reading %s\n", location ); } return fp; } Modified: trunk/sat-solver/testsuite/yps.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/yps.c?rev=11281&r1=11280&r2=11281&view=diff ============================================================================== --- trunk/sat-solver/testsuite/yps.c (original) +++ trunk/sat-solver/testsuite/yps.c Thu Oct 9 15:05:57 2008 @@ -85,7 +85,7 @@ load_callback(Pool *pool, Repodata *data, void *cbdata) { FILE *fp = 0; - const char *location = repodata_lookup_str(data, 0, REPOSITORY_LOCATION); + const char *location = repodata_lookup_str(data, REPOENTRY_META, REPOSITORY_LOCATION); if (location) { printf("loading %s\n", location); Modified: trunk/sat-solver/tools/mergesolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/mergesolv.c?rev=11281&r1=11280&r2=11281&view=diff ============================================================================== --- trunk/sat-solver/tools/mergesolv.c (original) +++ trunk/sat-solver/tools/mergesolv.c Thu Oct 9 15:05:57 2008 @@ -37,7 +37,7 @@ loadcallback (Pool *pool, Repodata *data, void *vdata) { FILE *fp = 0; - const char *location = repodata_lookup_str(data, 0, REPOSITORY_LOCATION); + const char *location = repodata_lookup_str(data, REPOENTRY_META, REPOSITORY_LOCATION); if (location) { fprintf(stderr, "Loading SOLV file %s\n", location); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org