Author: mlandres Date: Fri Oct 24 16:06:20 2008 New Revision: 11484 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11484&view=rev Log: Remember the /etc/products.d enties filename in .solv (bnc #432932) Modified: trunk/sat-solver/VERSION.cmake trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_products.c Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=11484&r1=11483&r2=11484&view=diff ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Fri Oct 24 16:06:20 2008 @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "12") -SET(LIBSATSOLVER_PATCH "0") +SET(LIBSATSOLVER_PATCH "1") -# last released 0.12.0 +# last released 0.12.1 Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=11484&r1=11483&r2=11484&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Oct 24 16:06:20 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 24 16:03:13 CEST 2008 - ma@suse.de + +- Remember the /etc/products.d enties filename in .solv + (bnc #432932) +- 0.12.1 + +------------------------------------------------------------------- Thu Oct 23 10:49:40 CEST 2008 - mrueckert@suse.de - add zlib-devel as buildrequires, cmake is looking for it Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=11484&r1=11483&r2=11484&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Fri Oct 24 16:06:20 2008 @@ -157,6 +157,7 @@ KNOWNID(UPDATE_REFERENCE_TITLE, "update:reference:title"), /* title, e.g. "the bla forz scribs on fuggle" */ /* name */ +KNOWNID(PRODUCT_REFERENCEFILE, "product:referencefile"), KNOWNID(PRODUCT_SHORTLABEL, "product:shortlabel"), KNOWNID(PRODUCT_DISTPRODUCT, "product:distproduct"), KNOWNID(PRODUCT_DISTVERSION, "product:distversion"), Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c?rev=11484&r1=11483&r2=11484&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Fri Oct 24 16:06:20 2008 @@ -92,6 +92,7 @@ struct parsedata { const char *filename; + const char *basename; int depth; enum state state; int statedepth; @@ -270,6 +271,9 @@ if (pd->ctime) repodata_set_num(pd->data, pd->handle, SOLVABLE_INSTALLTIME, pd->ctime); + if ( pd->basename ) + repodata_set_str(pd->data, pd->handle, PRODUCT_REFERENCEFILE, pd->basename); + /* this is where <productsdir>/baseproduct points to */ if (pd->currentproduct == pd->baseproduct) repodata_set_str(pd->data, pd->handle, PRODUCT_TYPE, "base"); @@ -570,6 +574,7 @@ break; } pd->filename = fullpath; + pd->basename = entry->d_name; repo_add_product(pd, fp, code11); fclose(fp); } @@ -600,7 +605,7 @@ if (!(flags & REPO_REUSE_REPODATA)) data = repo_add_repodata(repo, 0); - else + else data = repo_last_repodata(repo); memset(&pd, 0, sizeof(pd)); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org