August 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r10730 - /trunk/libzypp/package/libzypp.changes
by jkupec＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: jkupec Date: Sat Aug 2 19:27:24 2008 New Revision: 10730 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10730&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?… ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Sat Aug 2 19:27:24 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Aug 2 19:26:52 CEST 2008 - jkupec(a)suse.cz + +- support an optional url attribute in repoindex.xml's <repo> +- revision 10729 + +------------------------------------------------------------------- Thu Jul 31 21:52:11 CEST 2008 ma(a)suse.de - New class ProductInfo to provide product related metadata that -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10729 - in /trunk/libzypp/zypp: RepoManager.cc parser/RepoindexFileReader.cc
by jkupec＠svn.opensuse.org 02 Aug '08

02 Aug '08

Author: jkupec Date: Sat Aug 2 19:26:44 2008 New Revision: 10729 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10729&view=rev Log: - support an optional url attribute in repoindex.xml's <repo> Modified: trunk/libzypp/zypp/RepoManager.cc trunk/libzypp/zypp/parser/RepoindexFileReader.cc Modified: trunk/libzypp/zypp/RepoManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/RepoManager.cc?rev=… ============================================================================== --- trunk/libzypp/zypp/RepoManager.cc (original) +++ trunk/libzypp/zypp/RepoManager.cc Sat Aug 2 19:26:44 2008 @@ -1464,11 +1464,12 @@ mediamanager.release( mid ); mediamanager.close( mid ); - // set base url for all collected repositories - for_( it, collector.repos.begin(), collector.repos.end()) + // set service alias and base url for all collected repositories + for_( it, collector.repos.begin(), collector.repos.end() ) { - //repoUrl = it->baseUrlsBegin(); - it->setBaseUrl( service.url() ); + // if the repo url was not set by the repoindex parser, set service's url + if ( it->baseUrlsEmpty() ) + it->setBaseUrl( service.url() ); it->setService( service.alias() ); } Modified: trunk/libzypp/zypp/parser/RepoindexFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/RepoindexFil… ============================================================================== --- trunk/libzypp/zypp/parser/RepoindexFileReader.cc (original) +++ trunk/libzypp/zypp/parser/RepoindexFileReader.cc Sat Aug 2 19:26:44 2008 @@ -18,9 +18,11 @@ #include "zypp/Pathname.h" #include "zypp/parser/xml/Reader.h" +#include "zypp/parser/ParseException.h" #include "zypp/parser/RepoindexFileReader.h" + #undef ZYPP_BASE_LOGGER_LOGGROUP #define ZYPP_BASE_LOGGER_LOGGROUP "parser" @@ -94,14 +96,44 @@ // xpath: /repoindex/data (+) if ( reader_r->name() == "repo" ) { + XmlString s; RepoInfo info; + + // url and/or path + string url_s; + s = reader_r->getAttribute("url"); + if (s.get()) + url_s = s.asString(); + string path_s; + s = reader_r->getAttribute("path"); + if (s.get()) + path_s = s.asString(); + + if (url_s.empty() && path_s.empty()) + throw ParseException(_("One or both of 'url' or 'path' attributes is required.")); //! \todo FIXME this hardcodes the "/repo/" fragment - should not be if we want it to be usable by others! - info.setPath(Pathname(string("/repo/")+reader_r->getAttribute("path").asString())); + else if (url_s.empty()) + info.setPath(Pathname(string("/repo/") + path_s)); + else if (path_s.empty()) + info.setBaseUrl(Url(url_s)); + else + info.setBaseUrl(Url(url_s + "/repo/" + path_s)); + + // required alias info.setAlias(reader_r->getAttribute("alias").asString()); - info.setType(repo::RepoType::RPMMD_e); //TODO hardwired rpmmd??? - XmlString s = reader_r->getAttribute("name"); - if (s.get()) // name available so store it + + // optional type + s = reader_r->getAttribute("type"); + if (s.get()) + info.setType(repo::RepoType(s.asString())); + + // optional name + s = reader_r->getAttribute("name"); + if (s.get()) info.setName(s.asString()); + + DBG << info << endl; + // ignore the rest _callback(info); return true; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10728 - /trunk/libzypp/zypp/base/InterProcessMutex.cc
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 20:53:03 2008 New Revision: 10728 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10728&view=rev Log: - fixed typo Modified: trunk/libzypp/zypp/base/InterProcessMutex.cc Modified: trunk/libzypp/zypp/base/InterProcessMutex.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/InterProcessMu… ============================================================================== --- trunk/libzypp/zypp/base/InterProcessMutex.cc (original) +++ trunk/libzypp/zypp/base/InterProcessMutex.cc Fri Aug 1 20:53:03 2008 @@ -83,7 +83,7 @@ lock.l_whence = SEEK_SET; // GETLK tells you the conflicting lock as if the lock you pass - // would have been set. So set the lock type depending on wether + // would have been set. So set the lock type depending on whether // we are a writer or a reader. lock.l_type = ( ( _options.type == Writer ) ? F_WRLCK : F_RDLCK ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10727 - in /trunk/libzypp/devel/devel.dmacvicar: CMakeLists.txt RepositoryManager_tp.cc
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: dmacvicar Date: Fri Aug 1 19:29:02 2008 New Revision: 10727 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10727&view=rev Log: test program Modified: trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt trunk/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc Modified: trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/CM… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.dmacvicar/CMakeLists.txt Fri Aug 1 19:29:02 2008 @@ -3,8 +3,8 @@ ADD_EXECUTABLE(mediaaccess mediaaccess.cc) TARGET_LINK_LIBRARIES(mediaaccess zypp ) -ADD_EXECUTABLE(multiple-download multiple-download.cc) -TARGET_LINK_LIBRARIES(multiple-download zypp boost_thread) +#ADD_EXECUTABLE(multiple-download multiple-download.cc) +#TARGET_LINK_LIBRARIES(multiple-download zypp boost_thread) #ADD_EXECUTABLE(scansource ScanSource.cc) #TARGET_LINK_LIBRARIES(scansource zypp ) Modified: trunk/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.dmacvicar/Re… ============================================================================== --- trunk/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc (original) +++ trunk/libzypp/devel/devel.dmacvicar/RepositoryManager_tp.cc Fri Aug 1 19:29:02 2008 @@ -52,7 +52,7 @@ if ( isKind<Package>(res) ) { Package::constPtr p = asKind<Package>(res); - //cout << p->group() << std::endl; + cout << p->checksum() << std::endl; } } m.elapsed(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10726 - in /trunk/sat-solver: VERSION.cmake package/libsatsolver.changes tools/repo_rpmmd.c
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

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=107… ============================================================================== --- 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.… ============================================================================== --- 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(a)suse.de + +- insert the checksum in rpmmd generated solv files + (bnc#414002) +- 0.10.3 + +------------------------------------------------------------------- Tue Jul 29 10:53:22 CEST 2008 - mls(a)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?re… ============================================================================== --- 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>... + * <version...> + * + * extension package: + * + * For other.xml + * + * <package pkgid="b78f8664cd90efe42e09a345e272997ef1b53c18" + * name="zaptel-kmp-default" + * arch="i586"> + * <version epoch="0" + * ver="1.2.10_2.6.22_rc4_git6_2" + * rel="70"/> + */ + + /* 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(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10725 - in /branches/SuSE-Linux-11_0-Branch/sat-solver: VERSION.cmake package/libsatsolver.changes tools/repo_rpmmd.c
by dmacvicar＠svn.opensuse.org 01 Aug '08

01 Aug '08

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-so… ============================================================================== --- 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-so… ============================================================================== --- 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(a)suse.de + +- insert the checksum in rpmmd generated solv files + (bnc#414002) +- 0.9.4 + +------------------------------------------------------------------- Tue Jul 22 17:34:42 CEST 2008 - mls(a)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-so… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10724 - in /trunk/libzypp/zypp/base: InterProcessMutex.cc InterProcessMutex.h
by aschnell＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: aschnell Date: Fri Aug 1 18:50:27 2008 New Revision: 10724 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10724&view=rev Log: - fixed typos Modified: trunk/libzypp/zypp/base/InterProcessMutex.cc trunk/libzypp/zypp/base/InterProcessMutex.h Modified: trunk/libzypp/zypp/base/InterProcessMutex.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/InterProcessMu… ============================================================================== --- trunk/libzypp/zypp/base/InterProcessMutex.cc (original) +++ trunk/libzypp/zypp/base/InterProcessMutex.cc Fri Aug 1 18:50:27 2008 @@ -165,7 +165,7 @@ // actually there are no readers // lets delete it and break, so the next loop will - // probably suceed in creating it. The worst thing that can + // probably succeed in creating it. The worst thing that can // happen is that another process will take it first, but // we are not aiming at such level of correctness. Otherwise // the code path will complicate too much. @@ -211,7 +211,7 @@ // Nobody conflicts with a writer lock so nobody is actually // locking. // lets delete it and break, so the next loop will - // probably suceed in creating it. The worst thing that can + // probably succeed in creating it. The worst thing that can // happen is that another process will take it first, but // we are not aiming at such level of correctness. Otherwise // the code path will complicate too much. Modified: trunk/libzypp/zypp/base/InterProcessMutex.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/base/InterProcessMu… ============================================================================== --- trunk/libzypp/zypp/base/InterProcessMutex.h (original) +++ trunk/libzypp/zypp/base/InterProcessMutex.h Fri Aug 1 18:50:27 2008 @@ -66,7 +66,7 @@ * (wait till resource is free) * * The mutex type, Writer or Reader must be - * given explitly. + * given explictly. * * The mutex will be handled using a lock file * located on default library path if the -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10723 - /trunk/sat-solver/src/knownid.h
by kkaempf＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: kkaempf Date: Fri Aug 1 18:13:11 2008 New Revision: 10723 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10723&view=rev Log: PRODUCT_* id's Modified: trunk/sat-solver/src/knownid.h Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=107… ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Fri Aug 1 18:13:11 2008 @@ -153,6 +153,11 @@ KNOWNID(PRODUCT_EXTRAURLS, "product:extraurls"), KNOWNID(PRODUCT_OPTIONALURLS, "product:optionalurls"), KNOWNID(PRODUCT_FLAGS, "product:flags"), +KNOWNID(PRODUCT_NAME, "product:name"), +KNOWNID(PRODUCT_VERSION, "product:version"), +KNOWNID(PRODUCT_FLAVOR, "product:flavor"), +KNOWNID(PRODUCT_DISTRIBUTION, "product:distribution"), +KNOWNID(PRODUCT_VENDOR, "product:vendor"), /* argh */ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10722 - in /trunk/sat-solver/tools: repo_content.c repo_susetags.c repo_susetags.h susetags2solv.c
by kkaempf＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: kkaempf Date: Fri Aug 1 17:44:34 2008 New Revision: 10722 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10722&view=rev Log: update susetags parser for Code11 - backwards compatible with Code10 - support updated 'content' format (see http://en.opensuse.org/Standards/YaST2_Repository_Metadata/content) - augment specific package (REFERENCES line in content) with - product:name, product:version, product:distribution, product:flavor - add 'provides: product()' - add 'provides: product(<name>) = <version>' Modified: trunk/sat-solver/tools/repo_content.c trunk/sat-solver/tools/repo_susetags.c trunk/sat-solver/tools/repo_susetags.h trunk/sat-solver/tools/susetags2solv.c Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?… ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Fri Aug 1 17:44:34 2008 @@ -1,4 +1,11 @@ /* + * repo_content.c + * + * Parses 'content' file into .solv + * See http://en.opensuse.org/Standards/YaST2_Repository_Metadata/content for a description + * of the syntax + * + * * Copyright (c) 2007, Novell Inc. * * This program is licensed under the BSD license, read LICENSE.BSD @@ -18,6 +25,11 @@ #include "util.h" #include "repo_content.h" +/* + * split l into m parts, store to sp[] + * split at whitespace + */ + static int split(char *l, char **sp, int m) { @@ -40,12 +52,14 @@ return i; } + struct parsedata { Repo *repo; char *tmp; int tmpl; }; + static Id makeevr(Pool *pool, char *s) { @@ -54,6 +68,10 @@ return str2id(pool, s, 1); } +/* + * dependency relations + */ + static char *flagtab[] = { ">", "=", @@ -63,8 +81,13 @@ "<=" }; + +/* + * join up to three strings into one + */ + static char * -join(struct parsedata *pd, char *s1, char *s2, char *s3) +join(struct parsedata *pd, const char *s1, const char *s2, const char *s3) { int l = 1; char *p; @@ -99,6 +122,11 @@ return pd->tmp; } + +/* + * add dependency to pool + */ + static unsigned int adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, char *line, Id marker) { @@ -154,6 +182,11 @@ return olddeps; } + +/* + * split value and add to pool + */ + static void add_multiple_strings(Repodata *data, Id handle, Id name, char *value) { @@ -170,6 +203,12 @@ } } + +/* + * add 'content' to repo + * + */ + void repo_add_content(Repo *repo, FILE *fp) { @@ -180,7 +219,10 @@ struct parsedata pd; Repodata *data; Id handle = 0; - + int contentstyle = 0; + char *product_name = 0; + char *product_version = 0; + memset(&pd, 0, sizeof(pd)); line = sat_malloc(1024); aline = 1024; @@ -198,6 +240,8 @@ for (;;) { char *fields[2]; + + /* read line into big-enough buffer */ if (linep - line + 16 > aline) { aline = linep - line; @@ -212,6 +256,8 @@ continue; *--linep = 0; linep = line; + + /* expect "key value" lines */ if (split (line, fields, 2) == 2) { char *key = fields[0]; @@ -220,8 +266,50 @@ fprintf (stderr, "key %s, value %s\n", key, fields[1]); #endif -#define istag(x) !strcmp (key, x) - if (istag ("PRODUCT")) +#define istag(x) (!strcmp (key, x)) +#define code10 (contentstyle == 10) +#define code11 (contentstyle == 11) + + if (contentstyle == 0) + { + if (istag ("CONTENTSTYLE")) + { + contentstyle = atoi(value); + continue; + } + else + contentstyle = 10; + } + + if (code11 && istag ("REFERENCES")) + { + char *vals[3]; + Id nameid; + Id evrid = 0; + + if (split(value, vals, 3) == 3) + { + if (!strcmp(vals[1], "=")) + { + nameid = str2id(pool, vals[0], 1); + evrid = str2id(pool, vals[2], 1); + + s = pool_id2solvable(pool, repo_add_solvable(repo)); + repodata_extend(data, s - pool->solvables); + handle = repodata_get_handle(data, s - pool->solvables - repo->start); + + s->name = nameid; + s->evr = evrid; + s->provides = adddep(pool, &pd, s->provides, "product()", 0); + + continue; + } + } + fprintf(stderr, "REFERENCES must be 'name = evr'\n"); + break; + } + + if (code10 && istag ("PRODUCT")) { /* Finish old solvable, but only if it wasn't created on demand without seeing a PRODUCT entry. */ @@ -250,60 +338,88 @@ handle = repodata_get_handle(data, s - pool->solvables - repo->start); } if (istag ("VERSION")) - /* without a release? but that's like zypp implements it */ - s->evr = makeevr(pool, value); - else if (istag ("DISTPRODUCT")) + { + if (code11) + { + repo_set_str(repo, s - pool->solvables, PRODUCT_VERSION, value); + product_version = strdup(value); + } + else + /* without a release? but that's like zypp implements it */ + s->evr = makeevr(pool, value); + } + else if (code11 && istag ("NAME")) + { + repo_set_str(repo, s - pool->solvables, PRODUCT_NAME, value); + product_name = strdup(value); + } + else if (code11 && istag ("DISTRIBUTION")) + repo_set_str(repo, s - pool->solvables, PRODUCT_DISTRIBUTION, value); + else if (code11 && istag ("FLAVOR")) + repo_set_str(repo, s - pool->solvables, PRODUCT_FLAVOR, value); + else if (istag ("DATADIR")) + repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, value); + else if (istag ("UPDATEURLS")) + add_multiple_strings(data, handle, PRODUCT_UPDATEURLS, value); + else if (istag ("EXTRAURLS")) + add_multiple_strings(data, handle, PRODUCT_EXTRAURLS, value); + else if (istag ("OPTIONALURLS")) + add_multiple_strings(data, handle, PRODUCT_OPTIONALURLS, value); + else if (istag ("SHORTLABEL")) + repo_set_str(repo, s - pool->solvables, PRODUCT_SHORTLABEL, value); + else if (istag ("LABEL")) /* LABEL is the products SUMMARY. */ + repo_set_str(repo, s - pool->solvables, SOLVABLE_SUMMARY, value); + else if (!strncmp (key, "LABEL.", 6)) + repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value); + else if (istag ("FLAGS")) + add_multiple_strings(data, handle, PRODUCT_FLAGS, value); + else if (istag ("RELNOTESURL")) + repodata_add_poolstr_array(data, handle, PRODUCT_RELNOTESURL, value); + else if (istag ("VENDOR")) + { + if (code11) + repo_set_str(repo, s - pool->solvables, PRODUCT_VENDOR, value); + else + s->vendor = str2id(pool, value, 1); + } + + /* + * Every tag below is Code10 only + * + */ + + else if (code10 && istag ("DISTPRODUCT")) /* DISTPRODUCT is for registration and Yast, not for the solver. */ repo_set_str(repo, s - pool->solvables, PRODUCT_DISTPRODUCT, value); - else if (istag ("DISTVERSION")) + else if (code10 && istag ("DISTVERSION")) /* DISTVERSION is for registration and Yast, not for the solver. */ repo_set_str(repo, s - pool->solvables, PRODUCT_DISTVERSION, value); - else if (istag ("VENDOR")) - s->vendor = str2id(pool, value, 1); - else if (istag ("ARCH")) + else if (code10 && istag ("ARCH")) /* Theoretically we want to have the best arch of the given modifiers which still is compatible with the system arch. We don't know the latter here, though. */ s->arch = ARCH_NOARCH; - else if (istag ("PREREQUIRES")) + else if (code10 && istag ("PREREQUIRES")) s->requires = adddep(pool, &pd, s->requires, value, SOLVABLE_PREREQMARKER); - else if (istag ("REQUIRES")) + else if (code10 && istag ("REQUIRES")) s->requires = adddep(pool, &pd, s->requires, value, -SOLVABLE_PREREQMARKER); - else if (istag ("PROVIDES")) + else if (code10 && istag ("PROVIDES")) s->provides = adddep(pool, &pd, s->provides, value, 0); - else if (istag ("CONFLICTS")) + else if (code10 && istag ("CONFLICTS")) s->conflicts = adddep(pool, &pd, s->conflicts, value, 0); - else if (istag ("OBSOLETES")) + else if (code10 && istag ("OBSOLETES")) s->obsoletes = adddep(pool, &pd, s->obsoletes, value, 0); - else if (istag ("RECOMMENDS")) + else if (code10 && istag ("RECOMMENDS")) s->recommends = adddep(pool, &pd, s->recommends, value, 0); - else if (istag ("SUGGESTS")) + else if (code10 && istag ("SUGGESTS")) s->suggests = adddep(pool, &pd, s->suggests, value, 0); - else if (istag ("SUPPLEMENTS")) + else if (code10 && istag ("SUPPLEMENTS")) s->supplements = adddep(pool, &pd, s->supplements, value, 0); - else if (istag ("ENHANCES")) + else if (code10 && istag ("ENHANCES")) s->enhances = adddep(pool, &pd, s->enhances, value, 0); - else if (istag ("DATADIR")) - repo_set_str(repo, s - pool->solvables, SUSETAGS_DATADIR, value); /* FRESHENS doesn't seem to exist. */ - else if (istag ("TYPE")) + else if (code10 && istag ("TYPE")) repo_set_str(repo, s - pool->solvables, PRODUCT_TYPE, value); - else if (istag ("RELNOTESURL")) - repodata_add_poolstr_array(data, handle, PRODUCT_RELNOTESURL, value); - else if (istag ("UPDATEURLS")) - add_multiple_strings(data, handle, PRODUCT_UPDATEURLS, value); - else if (istag ("EXTRAURLS")) - add_multiple_strings(data, handle, PRODUCT_EXTRAURLS, value); - else if (istag ("OPTIONALURLS")) - add_multiple_strings(data, handle, PRODUCT_OPTIONALURLS, value); - else if (istag ("SHORTLABEL")) - repo_set_str(repo, s - pool->solvables, PRODUCT_SHORTLABEL, value); - else if (istag ("LABEL")) /* LABEL is the products SUMMARY. */ - repo_set_str(repo, s - pool->solvables, SOLVABLE_SUMMARY, value); - else if (!strncmp (key, "LABEL.", 6)) - repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value); - else if (istag ("FLAGS")) - add_multiple_strings(data, handle, PRODUCT_FLAGS, value); /* XXX do something about LINGUAS and ARCH? * <ma>: Don't think so. zypp does not use or propagate them. @@ -314,13 +430,38 @@ fprintf (stderr, "malformed line: %s\n", line); } - if (!s->arch) - s->arch = ARCH_NOARCH; - if (s && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) - s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); - if (s) - s->supplements = repo_fix_legacy(repo, s->provides, s->supplements, 0); + if (!s) + { + fprintf(stderr, "No product solvable created !\n"); + exit(1); + } + if (code11) + { + if (!product_name) + { + fprintf(stderr, "Product must have a name !\n"); + exit(1); + } + if (!product_version) + { + fprintf(stderr, "Product must have a version !\n"); + exit(1); + } + const char *product = join(&pd, "product(", product_name, ")"); + s->provides = adddep(pool, &pd, s->provides, join(&pd, product, " = ", product_version), 0); + free(product_version); + free(product_name); + } + if (code10) + { + if (!s->arch) + s->arch = ARCH_NOARCH; + if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC) + s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + s->supplements = repo_fix_legacy(repo, s->provides, s->supplements, 0); + } + if (pd.tmp) sat_free(pd.tmp); sat_free(line); Modified: trunk/sat-solver/tools/repo_susetags.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.c… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.c (original) +++ trunk/sat-solver/tools/repo_susetags.c Fri Aug 1 17:44:34 2008 @@ -454,8 +454,18 @@ commit_diskusage (pd, handle); } + +/* + * parse susetags + * + * fp: file to read from + * product: solvable representing the product (0 if none) + * language: current language (0 if none) + * flags: flags + */ + void -repo_add_susetags(Repo *repo, FILE *fp, Id vendor, const char *language, int flags) +repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int flags) { Pool *pool = repo->pool; char *line, *linep; @@ -471,7 +481,8 @@ Repodata *data = 0; Id blanr = -1; Id handle = 0; - + Id vendor = 0; + if ((flags & SUSETAGS_EXTEND) && repo->nrepodata) indesc = 1; if (repo->nrepodata) @@ -480,6 +491,14 @@ else data = repo_add_repodata(repo, 0); + if (product) + { + if (!strncmp (id2str(pool, pool->solvables[product].name), "product:", 8)) + vendor = pool->solvables[product].vendor; + else + vendor = str2id(pool, repo_lookup_str(pool->solvables + product, PRODUCT_VENDOR), 0); + } + memset(&pd, 0, sizeof(pd)); line = malloc(1024); aline = 1024; @@ -659,30 +678,43 @@ /* Now see if we know this solvable already. If we found neither the name nor the arch at all in this repo there's no chance of finding the exact solvable either. */ - if (indesc >= 2 && name && arch) + if (name && arch) { - int n, nn; - /* Now look for a solvable with the given name,evr,arch. - Our input is structured so, that the second set of =Pkg - lines comes in roughly the same order as the first set, so we - have a hint at where to start our search, namely were we found - the last entry. */ - for (n = repo->start, nn = n + last_found_pack; n < repo->end; n++, nn++) - { - if (nn >= repo->end) - nn = repo->start; - s = pool->solvables + nn; - if (s->repo == repo && s->name == name && s->evr == evr && s->arch == arch) - break; - } - if (n == repo->end) - s = 0; - else + if (product && (name == pool->solvables[product].name)) { - last_found_pack = nn - repo->start; - handle = repodata_get_handle(data, last_found_pack); + s = pool->solvables + product; + s->vendor = vendor; + s->arch = arch; + s->evr = evr; + handle = repodata_get_handle(data, s - pool->solvables - repo->start); + last_found_pack = (s - pool->solvables) - repo->start; + } + else if (indesc >= 2) + { + int n, nn; + /* Now look for a solvable with the given name,evr,arch. + Our input is structured so, that the second set of =Pkg + lines comes in roughly the same order as the first set, so we + have a hint at where to start our search, namely were we found + the last entry. */ + for (n = repo->start, nn = n + last_found_pack; n < repo->end; n++, nn++) + { + if (nn >= repo->end) + nn = repo->start; + s = pool->solvables + nn; + if (s->repo == repo && s->name == name && s->evr == evr && s->arch == arch) + break; + } + if (n == repo->end) + s = 0; + else + { + last_found_pack = nn - repo->start; + handle = repodata_get_handle(data, last_found_pack); + } } } + /* And if we still don't have a solvable, create a new one. */ if (!s) Modified: trunk/sat-solver/tools/repo_susetags.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_susetags.h… ============================================================================== --- trunk/sat-solver/tools/repo_susetags.h (original) +++ trunk/sat-solver/tools/repo_susetags.h Fri Aug 1 17:44:34 2008 @@ -12,4 +12,4 @@ #define SUSETAGS_KINDS_SEPARATELY 1 #define SUSETAGS_EXTEND 2 -extern void repo_add_susetags(Repo *repo, FILE *fp, Id vendor, const char *language, int flags); +extern void repo_add_susetags(Repo *repo, FILE *fp, Id product, const char *language, int flags); Modified: trunk/sat-solver/tools/susetags2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/susetags2solv.c… ============================================================================== --- trunk/sat-solver/tools/susetags2solv.c (original) +++ trunk/sat-solver/tools/susetags2solv.c Fri Aug 1 17:44:34 2008 @@ -79,7 +79,7 @@ const char *attrname = 0; const char *descrdir = 0; const char *basefile = 0; - Id vendor = 0; + Id product = 0; int flags = 0; int c; @@ -121,8 +121,8 @@ exit(1); } repo_add_content(repo, fp); - if (!strncmp (id2str(pool, pool->solvables[repo->start].name), "product:", 8)) - vendor = pool->solvables[repo->start].vendor; + product = repo->start; + fclose (fp); } if (attrname) @@ -139,6 +139,10 @@ } } + /* + * descrdir path given, open files and read from there + */ + if (descrdir) { char *fnp; @@ -185,7 +189,7 @@ perror(fn); exit(1); } - repo_add_susetags(repo, fp, vendor, 0, flags); + repo_add_susetags(repo, fp, product, 0, flags); fclose(fp); } else if (!strcmp(fn, "packages.DU") || !strcmp(fn, "packages.DU.gz")) @@ -197,7 +201,7 @@ perror(fn); exit(1); } - repo_add_susetags(repo, fp, vendor, 0, flags | SUSETAGS_EXTEND); + repo_add_susetags(repo, fp, product, 0, flags | SUSETAGS_EXTEND); fclose(fp); } else if (!strcmp(fn, "packages.FL") || !strcmp(fn, "packages.FL.gz")) @@ -210,7 +214,7 @@ perror(fn); exit(1); } - repo_add_susetags(repo, fp, vendor, 0, flags | SUSETAGS_EXTEND); + repo_add_susetags(repo, fp, product, 0, flags | SUSETAGS_EXTEND); fclose(fp); #else /* ignore for now. reactivate when filters work */ @@ -238,7 +242,7 @@ perror(fn); exit(1); } - repo_add_susetags(repo, fp, vendor, lang, flags | SUSETAGS_EXTEND); + repo_add_susetags(repo, fp, product, lang, flags | SUSETAGS_EXTEND); fclose(fp); } } @@ -248,7 +252,8 @@ free(fnp); } else - repo_add_susetags(repo, stdin, vendor, 0, flags); + /* read data from stdin */ + repo_add_susetags(repo, stdin, product, 0, flags); tool_write(repo, basefile, attrname); pool_free(pool); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r10721 - /trunk/sat-solver/doc/README.attr
by kkaempf＠svn.opensuse.org 01 Aug '08

01 Aug '08

Author: kkaempf Date: Fri Aug 1 16:09:20 2008 New Revision: 10721 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10721&view=rev Log: fix typo Modified: trunk/sat-solver/doc/README.attr Modified: trunk/sat-solver/doc/README.attr URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/doc/README.attr?rev=1… ============================================================================== --- trunk/sat-solver/doc/README.attr (original) +++ trunk/sat-solver/doc/README.attr Fri Aug 1 16:09:20 2008 @@ -238,7 +238,7 @@ 6.1 Reading known attributes For the standard attribute names as listed in knownid.h, the easiest - way to retrieve values it trough repo_lookup_*() (as opposed to + way to retrieve values it through repo_lookup_*() (as opposed to repodata_lookup_*()) /* get the summary attribute */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0