Author: kkaempf Date: Fri Aug 15 15:01:46 2008 New Revision: 10872 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10872&view=rev Log: - follow /etc/products.d/baseproduct and mark product as 'product:type = base' Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_products.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=10872&r1=10871&r2=10872&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Aug 15 15:01:46 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Aug 15 15:00:32 CEST 2008 - kkaempf@suse.de + +- follow /etc/products.d/baseproduct and mark product as 'base' + +------------------------------------------------------------------- Fri Aug 15 14:26:29 CEST 2008 - kkaempf@suse.de - Implement pre-code11 fallback for products, parse /etc/*-release Modified: trunk/sat-solver/tools/repo_products.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_products.c?rev=10872&r1=10871&r2=10872&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_products.c (original) +++ trunk/sat-solver/tools/repo_products.c Fri Aug 15 15:01:46 2008 @@ -28,6 +28,9 @@ #include "tools_util.h" #include "repo_content.h" + +static ino_t baseproduct = 0; + struct parsedata { Repo *repo; char *tmp; @@ -225,6 +228,9 @@ if (!fstat(fileno(fp), &st)) { repodata_set_num(data, handle, SOLVABLE_INSTALLTIME, st.st_ctime); + /* this is where <productsdir>/baseproduct points to */ + if (st.st_ino == baseproduct) + repodata_set_str(data, handle, PRODUCT_TYPE, "base"); } else { @@ -292,6 +298,14 @@ struct dirent *entry; char *suffix = code11 ? ".prod" : "-release"; int slen = code11 ? 5 : 8; /* strlen(".prod") : strlen("-release") */ + struct stat st; + + /* check for <productsdir>/baseproduct on code11 and remember its target inode */ + if (code11 + && stat(join2(path, "/", "baseproduct"), &st) == 0) /* follow symlink */ + { + baseproduct = st.st_ino; + } while ((entry = readdir(dir))) { -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org