Author: dmacvicar Date: Fri Aug 1 19:05:12 2008 New Revision: 10725 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10725&view=rev Log: - insert the checksum in rpmmd generated solv files (bnc#414002) - 0.9.4 Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/VERSION.cmake branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/VERSION.cmake?rev=10725&r1=10724&r2=10725&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/VERSION.cmake Fri Aug 1 19:05:12 2008 @@ -46,5 +46,5 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "9") -SET(LIBSATSOLVER_PATCH "3") +SET(LIBSATSOLVER_PATCH "4") Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes?rev=10725&r1=10724&r2=10725&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/package/libsatsolver.changes Fri Aug 1 19:05:12 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Aug 1 18:54:41 CEST 2008 - dmacvicar@suse.de + +- insert the checksum in rpmmd generated solv files + (bnc#414002) +- 0.9.4 + +------------------------------------------------------------------- Tue Jul 22 17:34:42 CEST 2008 - mls@suse.de - resolve job rules before installing system packages [bnc#411086] Modified: branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c?rev=10725&r1=10724&r2=10725&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c (original) +++ branches/SuSE-Linux-11_0-Branch/sat-solver/tools/repo_rpmmd.c Fri Aug 1 19:05:12 2008 @@ -238,6 +238,7 @@ const char *tmpattr; Repodata *data; Id handle; + XML_Parser *parser; }; static char *flagtabnum[] = { @@ -780,6 +781,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); @@ -904,6 +926,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