[zypp-commit] r10726 - in /trunk/sat-solver: VERSION.cmake package/libsatsolver.changes tools/repo_rpmmd.c

Author: dmacvicar Date: Fri Aug 1 19:29:01 2008 New Revision: 10726 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10726&view=rev Log: while trying to support package metadata extensions realized that checksums were not saved. So forward port the fix. insert the checksum in rpmmd generated solv files (bnc#414002) Modified: trunk/sat-solver/VERSION.cmake trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=10726&r1=10725&r2=10726&view=diff ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Fri Aug 1 19:29:01 2008 @@ -46,5 +46,5 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "10") -SET(LIBSATSOLVER_PATCH "2") +SET(LIBSATSOLVER_PATCH "3") Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=10726&r1=10725&r2=10726&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri Aug 1 19:29:01 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 1 18:59:22 CEST 2008 - dmacvicar@suse.de + +- insert the checksum in rpmmd generated solv files + (bnc#414002) +- 0.10.3 + +------------------------------------------------------------------- Tue Jul 29 10:53:22 CEST 2008 - mls@suse.de - resolve job rules before installing system packages [#411086] Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev=10726&r1=10725&r2=10726&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Fri Aug 1 19:29:01 2008 @@ -199,6 +199,7 @@ const char *tmpattr; Repodata *data; Id handle; + XML_Parser *parser; }; static Id @@ -483,9 +484,59 @@ else if (name[2] == 't' && name[3] == 'c') pd->kind = "patch"; - pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->common.repo)); - pd->freshens = 0; - repodata_extend(pd->data, pd->solvable - pool->solvables); + /** + * now we have two cases, one is that we are in the package tag of a new package + * and the other is that we are in the tag of an extension file like other.xml or + * filelist.xml. + * We identify it by looking the attributes + * + * new package + * <package> + * <name>... + * + * + * extension package: + * + * For other.xml + * + * + * + */ + + /* first check if there is a pkgid attribute */ + const char *pkgid = find_attr( "pkgid", atts); + + if ( pkgid == NULL ) + { + /* this is a new package */ + /*fprintf(stderr, "new package\n");*/ + pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->common.repo)); + pd->freshens = 0; + repodata_extend(pd->data, pd->solvable - pool->solvables); + } + else + { + /* we need to look for the package based on the pkgid */ + Dataiterator di; + dataiterator_init(&di, pd->common.repo, -1, SOLVABLE_CHECKSUM, pkgid, SEARCH_STRING); + if (dataiterator_step(&di)) + { + /* we found it */ + /*fprintf(stderr, "package found '%i'\n", di.solvid);*/ + pd->solvable = pool_id2solvable(pool, di.solvid); + } + else + { + /* this is bad, here we should ignore the whole solvable */ + fprintf(stderr, "can't find package with checksum '%s'\n", pkgid); + //exit(1); + } + } + pd->handle = repodata_get_handle(pd->data, (pd->solvable - pool->solvables) - pd->data->start); #if 0 fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables); @@ -669,6 +720,27 @@ case STATE_RPM_LICENSE: repodata_set_poolstr(pd->data, handle, SOLVABLE_LICENSE, pd->content); break; + case STATE_CHECKSUM: + { + int l; + Id type; + if (!strcasecmp (pd->tmpattr, "sha") || !strcasecmp (pd->tmpattr, "sha1")) + l = SIZEOF_SHA1 * 2, type = REPOKEY_TYPE_SHA1; + else if (!strcasecmp (pd->tmpattr, "md5")) + l = SIZEOF_MD5 * 2, type = REPOKEY_TYPE_MD5; + else + { + fprintf(stderr, "Unknown checksum type: %d: %s\n", (unsigned int)XML_GetCurrentLineNumber(*pd->parser), pd->tmpattr); + exit(1); + } + if (strlen(pd->content) != l) + { + fprintf(stderr, "Invalid checksum length: %d: for %s\n", (unsigned int)XML_GetCurrentLineNumber(*pd->parser), pd->tmpattr); + exit(1); + } + repodata_set_checksum(pd->data, handle, SOLVABLE_CHECKSUM, type, pd->content); + } + break; case STATE_FILE: #if 0 id = str2id(pool, pd->content, 1); @@ -769,6 +841,7 @@ pd.kind = 0; XML_Parser parser = XML_ParserCreate(NULL); XML_SetUserData(parser, &pd); + pd.parser = &parser; XML_SetElementHandler(parser, startElement, endElement); XML_SetCharacterDataHandler(parser, characterData); for (;;) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org