Author: mlschroe Date: Tue May 13 14:41:33 2008 New Revision: 10071 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10071&view=rev Log: - expand mergesolv a bit - fix tiny bug in cookie detection Modified: trunk/sat-solver/tools/common_write.c trunk/sat-solver/tools/mergesolv.c Modified: trunk/sat-solver/tools/common_write.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/common_write.c?rev=10071&r1=10070&r2=10071&view=diff ============================================================================== --- trunk/sat-solver/tools/common_write.c (original) +++ trunk/sat-solver/tools/common_write.c Tue May 13 14:41:33 2008 @@ -169,7 +169,10 @@ fileinfos = sat_zextend(fileinfos, nfileinfos, 1, sizeof(Repodatafile), REPODATAFILE_BLOCK); pool_addfileprovides_ids(repo->pool, 0, &fileinfos[nfileinfos].addedfileprovides); - if (repo->rpmdbcookie) + for (i = 0; i < 32; i++) + if (repo->rpmdbcookie[i]) + break; + if (i < 32) fileinfos[nfileinfos].rpmdbcookie = repo->rpmdbcookie; if (fileinfos[nfileinfos].addedfileprovides || fileinfos[nfileinfos].rpmdbcookie) nfileinfos++; Modified: trunk/sat-solver/tools/mergesolv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/mergesolv.c?rev=10071&r1=10070&r2=10071&view=diff ============================================================================== --- trunk/sat-solver/tools/mergesolv.c (original) +++ trunk/sat-solver/tools/mergesolv.c Tue May 13 14:41:33 2008 @@ -11,6 +11,7 @@ */ #include +#include #include #include #include @@ -32,31 +33,64 @@ exit(0); } +static FILE * +loadcallback (Pool *pool, Repodata *data, void *vdata) +{ + FILE *fp = 0; + if (data->location) + { + fprintf(stderr, "Loading SOLV file %s\n", data->location); + fp = fopen (data->location, "r"); + if (!fp) + perror(data->location); + } + return fp; +} int main(int argc, char **argv) { - Pool *pool = pool_create(); + Pool *pool; Repo *repo; + const char *basefile = 0; + int with_attr = 0; + int c; + + pool = pool_create(); + repo = repo_create(pool, "<mergesolv>"); + + while ((c = getopt(argc, argv, "ahb:")) >= 0) + { + switch (c) + { + case 'h': + usage(); + break; + case 'a': + with_attr = 1; + break; + case 'b': + basefile = optarg; + break; + default: + exit(1); + } + } + if (with_attr) + pool_setloadcallback(pool, loadcallback, 0); - repo = repo_create(pool, ""); - while (argc-- > 1) + for (; optind < argc; optind++) { FILE *fp; - argv++; - if (!strcmp(*argv,"-h")) - usage(); - if ((fp = fopen(*argv, "r")) == NULL) + if ((fp = fopen(argv[optind], "r")) == NULL) { - perror(argv[1]); + perror(argv[optind]); exit(0); } repo_add_solv(repo, fp); fclose(fp); } - - tool_write(repo, 0, 0); + tool_write(repo, basefile, 0); pool_free(pool); - return 0; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org