June 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - add support for homepage aka (solvable:url)
by Michael Schroeder 30 Jun '09

30 Jun '09

ref: refs/heads/master commit 3977a8b6accc0a2c6336a0ed3dfc9cdc7a824dcc Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 30 18:07:47 2009 +0200 - add support for homepage aka (solvable:url) --- ext/repo_deb.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ext/repo_deb.c b/ext/repo_deb.c index e35740c..2bd3f4c 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -232,6 +232,10 @@ control2solvable(Solvable *s, Repodata *data, char *control) if (!strcasecmp(tag, "enhances")) s->enhances = makedeps(repo, q, s->enhances, 0); break; + case 'H' << 8 | 'O': + if (!strcasecmp(tag, "homepage")) + repodata_set_str(data, s - pool->solvables, SOLVABLE_URL, q); + break; case 'I' << 8 | 'N': if (!strcasecmp(tag, "installed-size")) repodata_set_num(data, s - pool->solvables, SOLVABLE_INSTALLSIZE, atoi(q)); -- 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] <sat-solver> master : - no endless loops, please
by Michael Schroeder 30 Jun '09

30 Jun '09

ref: refs/heads/master commit 8db96768a5556498bbf963b898de8232aaf27770 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 30 16:56:11 2009 +0200 - no endless loops, please --- ext/repo_deb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ext/repo_deb.c b/ext/repo_deb.c index da352ba..e35740c 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -140,9 +140,10 @@ makedeps(Repo *repo, char *deps, unsigned int olddeps, Id marker) if (!id) id = name; else - id = rel2id(pool, id, name, REL_OR, 1); + id = rel2id(pool, id, name, REL_OR, 1); if (*p != '|') break; + p++; } if (!id) return olddeps; -- 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] <libzypp> master : changes
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/master commit 0c2547e1e24ad97f3e91037937b49e0df13027c9 Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 16:41:21 2009 +0200 changes --- package/libzypp.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 954aa11..5cb4c26 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 30 16:32:08 CEST 2009 - ma(a)suse.de + +- Enhance LookupAttr to allow direct query of attributes within + sub-structures (flexarrays). + +------------------------------------------------------------------- Fri Jun 26 12:06:51 CEST 2009 - ma(a)suse.de - Enhance PoolQueryIterator to allow detailed inspection of attribute -- 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] <libzypp> ma-misc : changes
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/ma-misc commit 0c2547e1e24ad97f3e91037937b49e0df13027c9 Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 16:41:21 2009 +0200 changes --- package/libzypp.changes | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 954aa11..5cb4c26 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jun 30 16:32:08 CEST 2009 - ma(a)suse.de + +- Enhance LookupAttr to allow direct query of attributes within + sub-structures (flexarrays). + +------------------------------------------------------------------- Fri Jun 26 12:06:51 CEST 2009 - ma(a)suse.de - Enhance PoolQueryIterator to allow detailed inspection of attribute -- 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] <sat-solver> master : - add repo_deb to CMakeLists.txt
by Michael Schroeder 30 Jun '09

30 Jun '09

ref: refs/heads/master commit 25c49541d4a5f14a15728014395f6af9dc81fdf8 Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 30 16:39:54 2009 +0200 - add repo_deb to CMakeLists.txt --- ext/CMakeLists.txt | 5 +++-- ext/repo_deb.c | 11 +++++------ ext/repo_rpmdb.c | 3 ++- src/chksum.c | 8 ++++---- src/poolid.c | 8 ++++++++ 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index 1f53aa8..c6bd1bc 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -1,7 +1,8 @@ SET(libsatsolverext_SRCS pool_fileconflicts.c repo_content.c repo_deltainfoxml.c repo_helix.c repo_products.c repo_releasefile_products.c repo_repomdxml.c repo_rpmdb.c repo_rpmmd.c - repo_susetags.c repo_updateinfoxml.c repo_write.c repo_zyppdb.c) + repo_susetags.c repo_updateinfoxml.c repo_write.c repo_zyppdb.c + repo_deb.c) ADD_LIBRARY(satsolverext STATIC ${libsatsolverext_SRCS}) @@ -9,7 +10,7 @@ SET(libsatsolver_HEADERS pool_fileconflicts.h repo_content.h repo_deltainfoxml.h repo_helix.h repo_products.h repo_releasefile_products.h repo_repomdxml.h repo_rpmdb.h repo_rpmmd.h repo_susetags.h repo_updateinfoxml.h repo_write.h repo_zyppdb.h - tools_util.h) + tools_util.h repo_deb.h) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") diff --git a/ext/repo_deb.c b/ext/repo_deb.c index 59807ac..da352ba 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -69,7 +69,6 @@ makedeps(Repo *repo, char *deps, unsigned int olddeps, Id marker) Pool *pool = repo->pool; char *p, *n, *ne, *e, *ee; Id id, name, evr; - int c; int flags; while ((p = strchr(deps, ',')) != 0) @@ -296,13 +295,13 @@ repo_add_debs(Repo *repo, const char **debs, int ndebs, int flags) continue; } l = fread(buf, 1, sizeof(buf), fp); - if (l < 8 + 60 || strncmp(buf, "!<arch>\ndebian-binary ", 8 + 16) != 0) + if (l < 8 + 60 || strncmp((char *)buf, "!<arch>\ndebian-binary ", 8 + 16) != 0) { fprintf(stderr, "%s: not a deb package\n", debs[i]); fclose(fp); continue; } - vlen = atoi(buf + 8 + 48); + vlen = atoi((char *)buf + 8 + 48); if (vlen < 0 || vlen > l) { fprintf(stderr, "%s: not a deb package\n", debs[i]); @@ -316,13 +315,13 @@ repo_add_debs(Repo *repo, const char **debs, int ndebs, int flags) fclose(fp); continue; } - if (strncmp(buf + 8 + 60 + vlen, "control.tar.gz ", 16) != 0) + if (strncmp((char *)buf + 8 + 60 + vlen, "control.tar.gz ", 16) != 0) { fprintf(stderr, "%s: control.tar.gz is not second entry\n", debs[i]); fclose(fp); continue; } - clen = atoi(buf + 8 + 60 + vlen + 48); + clen = atoi((char *)buf + 8 + 60 + vlen + 48); if (clen <= 0) { fprintf(stderr, "%s: control.tar.gz has illegal size\n", debs[i]); @@ -411,7 +410,7 @@ repo_add_debs(Repo *repo, const char **debs, int ndebs, int flags) for (j = 124; j < 124 + 12; j++) if (bp[j] >= '0' && bp[j] <= '7') l2 = l2 * 8 + (bp[j] - '0'); - if (!strcmp(bp, "./control")) + if (!strcmp((char *)bp, "./control")) break; l2 = 512 + ((l2 + 511) & ~511); l -= l2; diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c index 48a8d1e..7216685 100644 --- a/ext/repo_rpmdb.c +++ b/ext/repo_rpmdb.c @@ -1816,7 +1816,8 @@ repo_add_rpms(Repo *repo, const char **rpms, int nrpms, int flags) { Id handle = s - pool->solvables; repodata_set_location(data, handle, 0, 0, rpms[i]); - repodata_set_num(data, handle, SOLVABLE_DOWNLOADSIZE, (unsigned int)((stb.st_size + 1023) / 1024)); + if (S_ISREG(stb.st_mode)) + repodata_set_num(data, handle, SOLVABLE_DOWNLOADSIZE, (unsigned int)((stb.st_size + 1023) / 1024)); repodata_set_num(data, handle, SOLVABLE_HEADEREND, headerend); if (gotpkgid) repodata_set_bin_checksum(data, handle, SOLVABLE_PKGID, REPOKEY_TYPE_MD5, pkgid); diff --git a/src/chksum.c b/src/chksum.c index a66de46..2b917dd 100644 --- a/src/chksum.c +++ b/src/chksum.c @@ -76,23 +76,23 @@ sat_chksum_get(void *handle, int *lenp) case REPOKEY_TYPE_MD5: sat_MD5_Final(h->result, &h->c.md5); h->done = 1; - if (*lenp) + if (lenp) *lenp = 16; return h->result; case REPOKEY_TYPE_SHA1: sat_SHA1_Final(&h->c.sha1, h->result); h->done = 1; - if (*lenp) + if (lenp) *lenp = 20; return h->result; case REPOKEY_TYPE_SHA256: sat_SHA256_Final(h->result, &h->c.sha256); h->done = 1; - if (*lenp) + if (lenp) *lenp = 32; return h->result; default: - if (*lenp) + if (lenp) *lenp = 0; return 0; } diff --git a/src/poolid.c b/src/poolid.c index 9ed14d1..0503224 100644 --- a/src/poolid.c +++ b/src/poolid.c @@ -135,10 +135,18 @@ id2str(const Pool *pool, Id id) static const char *rels[] = { " ! ", +#ifndef DEBIAN_SEMANTICS " > ", +#else + " >> ", +#endif " = ", " >= ", +#ifndef DEBIAN_SEMANTICS " < ", +#else + " << ", +#endif " <> ", " <= ", " <=> " -- 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] <libzypp> master : Enhance LookupAttr to allow direct query of attributes within flexarrays.
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/master commit e4e79389d3652d62784fe0bf5828f58993f23993 Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 16:38:23 2009 +0200 Enhance LookupAttr to allow direct query of attributes within flexarrays. --- tests/sat/LookupAttr_test.cc | 28 ++++++++++++ zypp/sat/LookupAttr.cc | 99 +++++++++++++++++++++++++++++++++++------- zypp/sat/LookupAttr.h | 37 +++++++++++++++- 3 files changed, 146 insertions(+), 18 deletions(-) diff --git a/tests/sat/LookupAttr_test.cc b/tests/sat/LookupAttr_test.cc index ab8c545..6ee003d 100644 --- a/tests/sat/LookupAttr_test.cc +++ b/tests/sat/LookupAttr_test.cc @@ -180,7 +180,35 @@ BOOST_AUTO_TEST_CASE(LookupAttr_solvable_attribute_substructure) BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceHref ), res.subFind( "href" ) ); BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceId ), res.subFind( "id" ) ); BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceTitle ), res.subFind( "title" ) ); + + // NOTE: Unfortunately the satsolver dataiterator loses constect information when + // entering a sub-structure. That's why one can't invoke e.g subBegin on an iterator + // that was retieved by subFind. + // The test below will fail, once libsatsolver fixes the dataiterator. The expected + // result then is, that subBegin brings you to the beginning again. + BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceType ).subBegin(), res.subEnd() ); + // BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceType ).subBegin(), res.subBegin() ); } + + // search substructure id without parent-structure won't work: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId ); + BOOST_CHECK_EQUAL( q.size(), 0 ); + + // search id in parent-structure: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId, sat::SolvAttr::updateReference ); + BOOST_CHECK_EQUAL( q.size(), 303 ); + + // search id in any parent-structure: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId, sat::SolvAttr::allAttr ); + BOOST_CHECK_EQUAL( q.size(), 303 ); + + // search any id in parent-structure: (4 ids per updateReference) + q = sat::LookupAttr( sat::SolvAttr::allAttr, sat::SolvAttr::updateReference ); + BOOST_CHECK_EQUAL( q.size(), 1212 ); + + // search any id in any parent-structure: + q = sat::LookupAttr( sat::SolvAttr::allAttr, sat::SolvAttr::allAttr ); + BOOST_CHECK_EQUAL( q.size(), 10473 ); } BOOST_AUTO_TEST_CASE(LookupAttr_repoattr) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 750b081..71acfab 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -58,13 +58,13 @@ namespace zypp Impl() {} Impl( SolvAttr attr_r, Location loc_r ) - : _attr( attr_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) {} Impl( SolvAttr attr_r, Repository repo_r, Location loc_r ) - : _attr( attr_r ), _repo( repo_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _repo( repo_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) {} Impl( SolvAttr attr_r, Solvable solv_r ) - : _attr( attr_r ), _solv( solv_r ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _solv( solv_r ) {} public: @@ -111,6 +111,13 @@ namespace zypp _solv = solv_r; } + SolvAttr parent() const + { return _parent; } + + void setParent( SolvAttr attr_r ) + { _parent = attr_r; } + + public: LookupAttr::iterator begin() const { if ( _attr == SolvAttr::noAttr || sat::Pool::instance().reposEmpty() ) @@ -123,6 +130,8 @@ namespace zypp whichRepo = _repo.id(); detail::DIWrap dip( whichRepo, _solv.id(), _attr.id(), _attrMatcher.searchstring(), _attrMatcher.flags().get() ); + if ( _parent != SolvAttr::noAttr ) + ::dataiterator_prepend_keyname( dip.get(), _parent.id() ); return iterator( dip ); // iterator takes over ownership! } @@ -131,6 +140,7 @@ namespace zypp private: SolvAttr _attr; + SolvAttr _parent; Repository _repo; Solvable _solv; AttrMatcher _attrMatcher; @@ -155,14 +165,24 @@ namespace zypp LookupAttr::LookupAttr( SolvAttr attr_r, Location loc_r ) : _pimpl( new Impl( attr_r, loc_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Location loc_r ) + : _pimpl( new Impl( attr_r, loc_r ) ) + { _pimpl->setParent( parent_r ); } LookupAttr::LookupAttr( SolvAttr attr_r, Repository repo_r, Location loc_r ) : _pimpl( new Impl( attr_r, repo_r, loc_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Repository repo_r, Location loc_r ) + : _pimpl( new Impl( attr_r, repo_r, loc_r ) ) + { _pimpl->setParent( parent_r ); } LookupAttr::LookupAttr( SolvAttr attr_r, Solvable solv_r ) : _pimpl( new Impl( attr_r, solv_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Solvable solv_r ) + : _pimpl( new Impl( attr_r, solv_r ) ) + { _pimpl->setParent( parent_r ); } + /////////////////////////////////////////////////////////////////// @@ -198,6 +218,12 @@ namespace zypp void LookupAttr::setSolvable( Solvable solv_r ) { _pimpl->setSolvable( solv_r ); } + SolvAttr LookupAttr::parent() const + { return _pimpl->parent(); } + + void LookupAttr::setParent( SolvAttr attr_r ) + { _pimpl->setParent( attr_r ); } + /////////////////////////////////////////////////////////////////// LookupAttr::iterator LookupAttr::begin() const @@ -417,10 +443,25 @@ namespace zypp return false; } - bool LookupAttr::iterator::solvAttrSubEntry() const + /////////////////////////////////////////////////////////////////// + namespace { - return solvAttrType() == REPOKEY_TYPE_FLEXARRAY; + enum SubType { ST_NONE, // no sub-structure + ST_FLEX, // flexarray + ST_SUB }; // inside sub-structure + SubType subType( const detail::DIWrap & dip ) + { + if ( ! dip ) + return ST_NONE; + if ( dip.get()->key->type == REPOKEY_TYPE_FLEXARRAY ) + return ST_FLEX; + return dip.get()->kv.parent ? ST_SUB : ST_NONE; + } } + /////////////////////////////////////////////////////////////////// + + bool LookupAttr::iterator::solvAttrSubEntry() const + { return subType( _dip ) != ST_NONE; } /////////////////////////////////////////////////////////////////// // Iterate sub-structures. @@ -439,12 +480,18 @@ namespace zypp LookupAttr::iterator LookupAttr::iterator::subBegin() const { - if ( ! solvAttrSubEntry() ) - return subEnd(); - - // remember this position - ::dataiterator_setpos( _dip.get() ); - + switch ( subType( _dip ) ) + { + case ST_NONE: + return subEnd(); + break; + case ST_FLEX: + ::dataiterator_setpos( _dip.get() ); + break; + case ST_SUB: + ::dataiterator_setpos_parent( _dip.get() ); + break; + } // setup the new sub iterator with the remembered position detail::DIWrap dip( 0, SOLVID_POS, 0, 0, 0 ); return iterator( dip ); // iterator takes over ownership! @@ -471,9 +518,29 @@ namespace zypp if ( attrname_r.empty() ) return subBegin(); + SubType subtype( subType( _dip ) ); + if ( subtype == ST_NONE ) + return subBegin(); + std::string subattr( inSolvAttr().asString() ); - subattr += ":"; - subattr += attrname_r; + if ( subtype == ST_FLEX ) + { + // append ":attrname" + subattr += ":"; + subattr += attrname_r; + } + else + { + // replace "oldname" after ':' with "attrname" + std::string::size_type pos( subattr.rfind( ':' ) ); + if ( pos != std::string::npos ) + { + subattr.erase( pos+1 ); + subattr += attrname_r; + } + else + subattr = attrname_r; // no ':' so replace all. + } return subFind( SolvAttr( subattr ) ); } @@ -577,7 +644,7 @@ namespace zypp { str << " " << it.inSolvAttr() << " = " << it.asString() << endl; } - str << "}" << endl; + str << "}"; return str.str(); } break; @@ -695,8 +762,8 @@ namespace zypp else if ( obj.inRepo() ) str << obj.inRepo(); - str << '<' << obj.inSolvAttr() - << ">(" << IdString(obj.solvAttrType()) << ") = " << obj.asString(); + str << '<' << obj.inSolvAttr() << (obj.solvAttrSubEntry() ? ">(*" : ">(") + << IdString(obj.solvAttrType()) << ") = " << obj.asString(); return str; } diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index 944563b..5af9688 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -60,6 +60,20 @@ namespace zypp * * Use \ref SolvAttr::allAttr to search all attributes. * + * To search for attributes located in a sub-structure (flexarray) + * you also have to pass the sub-structures attribute as parent. + * Passing \ref SolvAttr::allAttr a parent will lookup the attribute + * in \c any sub-structure. + * + * \code + * // Lookup all 'name' attributes: + * sat::LookupAttr q( sat::SolvAttr::name ); + * // Lookup all 'name' attributes within a sub-structure 'data': + * sat::LookupAttr q( sat::SolvAttr::name, sat::SolvAttr::data ); + * // Lookup all 'name' attributes within any sub-structure: + * sat::LookupAttr q( sat::SolvAttr::name, sat::SolvAttr::allAttr ); + * \endcode + * * \code * // look for all attributes of one solvable * void ditest( sat::Solvable slv_r ) @@ -113,12 +127,18 @@ namespace zypp /** Lookup \ref SolvAttr in \ref Pool (all repositories). */ explicit LookupAttr( SolvAttr attr_r, Location = SOLV_ATTR ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Location = SOLV_ATTR ); /** Lookup \ref SolvAttr in one\ref Repository. */ - explicit LookupAttr( SolvAttr attr_r, Repository repo_r, Location = SOLV_ATTR ); + LookupAttr( SolvAttr attr_r, Repository repo_r, Location = SOLV_ATTR ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Repository repo_r, Location = SOLV_ATTR ); /** Lookup \ref SolvAttr in one \ref Solvable. */ LookupAttr( SolvAttr attr_r, Solvable solv_r ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Solvable solv_r ); public: /** \name Search result. */ @@ -196,6 +216,12 @@ namespace zypp /** Set search in one \ref Solvable. */ void setSolvable( Solvable solv_r ); + + /** Whether to search within a sub-structure (\ref SolvAttr::noAttr if not) */ + SolvAttr parent() const; + + /** Set search within a sub-structure (\ref SolvAttr::noAttr for none) */ + void setParent( SolvAttr attr_r ); //@} private: @@ -376,7 +402,7 @@ namespace zypp /** The current \ref SolvAttr. */ SolvAttr inSolvAttr() const; - /** Whether this points to the end of a query. */ + /** Whether this points to the end of a query (Iterator is invalid). */ bool atEnd() const { return !_dip; } //@} @@ -409,6 +435,13 @@ namespace zypp * * These are usable iff \ref solvAttrSubEntry is \c true. * + * \note Unfortunately the underlying satsolver dataiterator as returned + * by \ref subBegin and \ref subFind loses some context when being created. + * Thus it's not possible to invoke \ref subBegin and \ref subFind on an + * iterator that was previously returned by one of those methods. The result + * will be an \c end iterator. For the same reason it is not possible for an + * iterator to leave the sub-structure again. + * * \code * // Lookup all "update:reference" entries for a specific solvable * sat::LookupAttr q( sat::SolvAttr::updateReference, p->satSolvable() ); -- 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] <libzypp> ma-misc : Enhance LookupAttr to allow direct query of attributes within flexarrays.
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/ma-misc commit e4e79389d3652d62784fe0bf5828f58993f23993 Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 16:38:23 2009 +0200 Enhance LookupAttr to allow direct query of attributes within flexarrays. --- tests/sat/LookupAttr_test.cc | 28 ++++++++++++ zypp/sat/LookupAttr.cc | 99 +++++++++++++++++++++++++++++++++++------- zypp/sat/LookupAttr.h | 37 +++++++++++++++- 3 files changed, 146 insertions(+), 18 deletions(-) diff --git a/tests/sat/LookupAttr_test.cc b/tests/sat/LookupAttr_test.cc index ab8c545..6ee003d 100644 --- a/tests/sat/LookupAttr_test.cc +++ b/tests/sat/LookupAttr_test.cc @@ -180,7 +180,35 @@ BOOST_AUTO_TEST_CASE(LookupAttr_solvable_attribute_substructure) BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceHref ), res.subFind( "href" ) ); BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceId ), res.subFind( "id" ) ); BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceTitle ), res.subFind( "title" ) ); + + // NOTE: Unfortunately the satsolver dataiterator loses constect information when + // entering a sub-structure. That's why one can't invoke e.g subBegin on an iterator + // that was retieved by subFind. + // The test below will fail, once libsatsolver fixes the dataiterator. The expected + // result then is, that subBegin brings you to the beginning again. + BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceType ).subBegin(), res.subEnd() ); + // BOOST_CHECK_EQUAL( res.subFind( sat::SolvAttr::updateReferenceType ).subBegin(), res.subBegin() ); } + + // search substructure id without parent-structure won't work: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId ); + BOOST_CHECK_EQUAL( q.size(), 0 ); + + // search id in parent-structure: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId, sat::SolvAttr::updateReference ); + BOOST_CHECK_EQUAL( q.size(), 303 ); + + // search id in any parent-structure: + q = sat::LookupAttr( sat::SolvAttr::updateReferenceId, sat::SolvAttr::allAttr ); + BOOST_CHECK_EQUAL( q.size(), 303 ); + + // search any id in parent-structure: (4 ids per updateReference) + q = sat::LookupAttr( sat::SolvAttr::allAttr, sat::SolvAttr::updateReference ); + BOOST_CHECK_EQUAL( q.size(), 1212 ); + + // search any id in any parent-structure: + q = sat::LookupAttr( sat::SolvAttr::allAttr, sat::SolvAttr::allAttr ); + BOOST_CHECK_EQUAL( q.size(), 10473 ); } BOOST_AUTO_TEST_CASE(LookupAttr_repoattr) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 750b081..71acfab 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -58,13 +58,13 @@ namespace zypp Impl() {} Impl( SolvAttr attr_r, Location loc_r ) - : _attr( attr_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) {} Impl( SolvAttr attr_r, Repository repo_r, Location loc_r ) - : _attr( attr_r ), _repo( repo_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _repo( repo_r ), _solv( loc_r == REPO_ATTR ? SOLVID_META : noSolvableId ) {} Impl( SolvAttr attr_r, Solvable solv_r ) - : _attr( attr_r ), _solv( solv_r ) + : _attr( attr_r ), _parent( SolvAttr::noAttr ), _solv( solv_r ) {} public: @@ -111,6 +111,13 @@ namespace zypp _solv = solv_r; } + SolvAttr parent() const + { return _parent; } + + void setParent( SolvAttr attr_r ) + { _parent = attr_r; } + + public: LookupAttr::iterator begin() const { if ( _attr == SolvAttr::noAttr || sat::Pool::instance().reposEmpty() ) @@ -123,6 +130,8 @@ namespace zypp whichRepo = _repo.id(); detail::DIWrap dip( whichRepo, _solv.id(), _attr.id(), _attrMatcher.searchstring(), _attrMatcher.flags().get() ); + if ( _parent != SolvAttr::noAttr ) + ::dataiterator_prepend_keyname( dip.get(), _parent.id() ); return iterator( dip ); // iterator takes over ownership! } @@ -131,6 +140,7 @@ namespace zypp private: SolvAttr _attr; + SolvAttr _parent; Repository _repo; Solvable _solv; AttrMatcher _attrMatcher; @@ -155,14 +165,24 @@ namespace zypp LookupAttr::LookupAttr( SolvAttr attr_r, Location loc_r ) : _pimpl( new Impl( attr_r, loc_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Location loc_r ) + : _pimpl( new Impl( attr_r, loc_r ) ) + { _pimpl->setParent( parent_r ); } LookupAttr::LookupAttr( SolvAttr attr_r, Repository repo_r, Location loc_r ) : _pimpl( new Impl( attr_r, repo_r, loc_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Repository repo_r, Location loc_r ) + : _pimpl( new Impl( attr_r, repo_r, loc_r ) ) + { _pimpl->setParent( parent_r ); } LookupAttr::LookupAttr( SolvAttr attr_r, Solvable solv_r ) : _pimpl( new Impl( attr_r, solv_r ) ) {} + LookupAttr::LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Solvable solv_r ) + : _pimpl( new Impl( attr_r, solv_r ) ) + { _pimpl->setParent( parent_r ); } + /////////////////////////////////////////////////////////////////// @@ -198,6 +218,12 @@ namespace zypp void LookupAttr::setSolvable( Solvable solv_r ) { _pimpl->setSolvable( solv_r ); } + SolvAttr LookupAttr::parent() const + { return _pimpl->parent(); } + + void LookupAttr::setParent( SolvAttr attr_r ) + { _pimpl->setParent( attr_r ); } + /////////////////////////////////////////////////////////////////// LookupAttr::iterator LookupAttr::begin() const @@ -417,10 +443,25 @@ namespace zypp return false; } - bool LookupAttr::iterator::solvAttrSubEntry() const + /////////////////////////////////////////////////////////////////// + namespace { - return solvAttrType() == REPOKEY_TYPE_FLEXARRAY; + enum SubType { ST_NONE, // no sub-structure + ST_FLEX, // flexarray + ST_SUB }; // inside sub-structure + SubType subType( const detail::DIWrap & dip ) + { + if ( ! dip ) + return ST_NONE; + if ( dip.get()->key->type == REPOKEY_TYPE_FLEXARRAY ) + return ST_FLEX; + return dip.get()->kv.parent ? ST_SUB : ST_NONE; + } } + /////////////////////////////////////////////////////////////////// + + bool LookupAttr::iterator::solvAttrSubEntry() const + { return subType( _dip ) != ST_NONE; } /////////////////////////////////////////////////////////////////// // Iterate sub-structures. @@ -439,12 +480,18 @@ namespace zypp LookupAttr::iterator LookupAttr::iterator::subBegin() const { - if ( ! solvAttrSubEntry() ) - return subEnd(); - - // remember this position - ::dataiterator_setpos( _dip.get() ); - + switch ( subType( _dip ) ) + { + case ST_NONE: + return subEnd(); + break; + case ST_FLEX: + ::dataiterator_setpos( _dip.get() ); + break; + case ST_SUB: + ::dataiterator_setpos_parent( _dip.get() ); + break; + } // setup the new sub iterator with the remembered position detail::DIWrap dip( 0, SOLVID_POS, 0, 0, 0 ); return iterator( dip ); // iterator takes over ownership! @@ -471,9 +518,29 @@ namespace zypp if ( attrname_r.empty() ) return subBegin(); + SubType subtype( subType( _dip ) ); + if ( subtype == ST_NONE ) + return subBegin(); + std::string subattr( inSolvAttr().asString() ); - subattr += ":"; - subattr += attrname_r; + if ( subtype == ST_FLEX ) + { + // append ":attrname" + subattr += ":"; + subattr += attrname_r; + } + else + { + // replace "oldname" after ':' with "attrname" + std::string::size_type pos( subattr.rfind( ':' ) ); + if ( pos != std::string::npos ) + { + subattr.erase( pos+1 ); + subattr += attrname_r; + } + else + subattr = attrname_r; // no ':' so replace all. + } return subFind( SolvAttr( subattr ) ); } @@ -577,7 +644,7 @@ namespace zypp { str << " " << it.inSolvAttr() << " = " << it.asString() << endl; } - str << "}" << endl; + str << "}"; return str.str(); } break; @@ -695,8 +762,8 @@ namespace zypp else if ( obj.inRepo() ) str << obj.inRepo(); - str << '<' << obj.inSolvAttr() - << ">(" << IdString(obj.solvAttrType()) << ") = " << obj.asString(); + str << '<' << obj.inSolvAttr() << (obj.solvAttrSubEntry() ? ">(*" : ">(") + << IdString(obj.solvAttrType()) << ") = " << obj.asString(); return str; } diff --git a/zypp/sat/LookupAttr.h b/zypp/sat/LookupAttr.h index 944563b..5af9688 100644 --- a/zypp/sat/LookupAttr.h +++ b/zypp/sat/LookupAttr.h @@ -60,6 +60,20 @@ namespace zypp * * Use \ref SolvAttr::allAttr to search all attributes. * + * To search for attributes located in a sub-structure (flexarray) + * you also have to pass the sub-structures attribute as parent. + * Passing \ref SolvAttr::allAttr a parent will lookup the attribute + * in \c any sub-structure. + * + * \code + * // Lookup all 'name' attributes: + * sat::LookupAttr q( sat::SolvAttr::name ); + * // Lookup all 'name' attributes within a sub-structure 'data': + * sat::LookupAttr q( sat::SolvAttr::name, sat::SolvAttr::data ); + * // Lookup all 'name' attributes within any sub-structure: + * sat::LookupAttr q( sat::SolvAttr::name, sat::SolvAttr::allAttr ); + * \endcode + * * \code * // look for all attributes of one solvable * void ditest( sat::Solvable slv_r ) @@ -113,12 +127,18 @@ namespace zypp /** Lookup \ref SolvAttr in \ref Pool (all repositories). */ explicit LookupAttr( SolvAttr attr_r, Location = SOLV_ATTR ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Location = SOLV_ATTR ); /** Lookup \ref SolvAttr in one\ref Repository. */ - explicit LookupAttr( SolvAttr attr_r, Repository repo_r, Location = SOLV_ATTR ); + LookupAttr( SolvAttr attr_r, Repository repo_r, Location = SOLV_ATTR ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Repository repo_r, Location = SOLV_ATTR ); /** Lookup \ref SolvAttr in one \ref Solvable. */ LookupAttr( SolvAttr attr_r, Solvable solv_r ); + /** \overload SolvAttr within sub-structure \a parent_r. */ + LookupAttr( SolvAttr attr_r, SolvAttr parent_r, Solvable solv_r ); public: /** \name Search result. */ @@ -196,6 +216,12 @@ namespace zypp /** Set search in one \ref Solvable. */ void setSolvable( Solvable solv_r ); + + /** Whether to search within a sub-structure (\ref SolvAttr::noAttr if not) */ + SolvAttr parent() const; + + /** Set search within a sub-structure (\ref SolvAttr::noAttr for none) */ + void setParent( SolvAttr attr_r ); //@} private: @@ -376,7 +402,7 @@ namespace zypp /** The current \ref SolvAttr. */ SolvAttr inSolvAttr() const; - /** Whether this points to the end of a query. */ + /** Whether this points to the end of a query (Iterator is invalid). */ bool atEnd() const { return !_dip; } //@} @@ -409,6 +435,13 @@ namespace zypp * * These are usable iff \ref solvAttrSubEntry is \c true. * + * \note Unfortunately the underlying satsolver dataiterator as returned + * by \ref subBegin and \ref subFind loses some context when being created. + * Thus it's not possible to invoke \ref subBegin and \ref subFind on an + * iterator that was previously returned by one of those methods. The result + * will be an \c end iterator. For the same reason it is not possible for an + * iterator to leave the sub-structure again. + * * \code * // Lookup all "update:reference" entries for a specific solvable * sat::LookupAttr q( sat::SolvAttr::updateReference, p->satSolvable() ); -- 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] <sat-solver> master : - finish repo_deb.[ch]
by Michael Schroeder 30 Jun '09

30 Jun '09

ref: refs/heads/master commit bdcc02d5803556b45106758dcea3fbacca5a981b Author: Michael Schroeder <mls(a)suse.de> Date: Tue Jun 30 16:37:19 2009 +0200 - finish repo_deb.[ch] --- ext/repo_deb.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 200 insertions(+), 13 deletions(-) diff --git a/ext/repo_deb.c b/ext/repo_deb.c index 3ed362b..59807ac 100644 --- a/ext/repo_deb.c +++ b/ext/repo_deb.c @@ -63,9 +63,205 @@ decompress(unsigned char *in, int inl, int *outlp) return out; } +static unsigned int +makedeps(Repo *repo, char *deps, unsigned int olddeps, Id marker) +{ + Pool *pool = repo->pool; + char *p, *n, *ne, *e, *ee; + Id id, name, evr; + int c; + int flags; + + while ((p = strchr(deps, ',')) != 0) + { + *p++ = 0; + olddeps = makedeps(repo, deps, olddeps, marker); + deps = p; + } + id = 0; + p = deps; + for (;;) + { + while (*p == ' ' || *p == '\t' || *p == '\n') + p++; + if (!*p || *p == '(') + break; + n = p; + while (*p && *p != ' ' && *p != '\t' && *p != '\n' && *p != '(' && *p != '|') + p++; + ne = p; + while (*p == ' ' || *p == '\t' || *p == '\n') + p++; + evr = 0; + flags = 0; + e = ee = 0; + if (*p == '(') + { + p++; + while (*p == ' ' || *p == '\t' || *p == '\n') + p++; + if (*p == '>') + flags |= REL_GT; + else if (*p == '=') + flags |= REL_EQ; + else if (*p == '<') + flags |= REL_LT; + if (flags) + { + p++; + if (*p == '>') + flags |= REL_GT; + else if (*p == '=') + flags |= REL_EQ; + else if (*p == '<') + flags |= REL_LT; + else + p--; + p++; + } + while (*p == ' ' || *p == '\t' || *p == '\n') + p++; + e = p; + while (*p && *p != ' ' && *p != '\t' && *p != '\n' && *p != ')') + p++; + ee = p; + while (*p && *p != ')') + p++; + if (*p) + p++; + while (*p == ' ' || *p == '\t' || *p == '\n') + p++; + } + name = strn2id(pool, n, ne - n, 1); + if (e) + { + evr = strn2id(pool, e, ee - e, 1); + name = rel2id(pool, name, evr, flags, 1); + } + if (!id) + id = name; + else + id = rel2id(pool, id, name, REL_OR, 1); + if (*p != '|') + break; + } + if (!id) + return olddeps; + return repo_addid_dep(repo, olddeps, id, marker); +} + + +/* put data from control file into the solvable */ +/* warning: does inplace changes */ static void -control2solvable(Solvable *s, char *control) +control2solvable(Solvable *s, Repodata *data, char *control) { + Repo *repo = s->repo; + Pool *pool = repo->pool; + char *p, *q, *end, *tag; + int x, l; + + p = control; + while (*p) + { + p = strchr(p, '\n'); + if (!p) + break; + if (p[1] == ' ' || p[1] == '\t') + { + char *q; + /* continuation line */ + q = p - 1; + while (q >= control && *q == ' ' && *q == '\t') + q--; + l = q + 1 - control; + if (l) + memmove(p + 1 - l, control, l); + control = p + 1 - l; + p[1] = '\n'; + p += 2; + continue; + } + end = p - 1; + if (*p) + *p++ = 0; + /* strip trailing space */ + while (end >= control && *end == ' ' && *end == '\t') + *end-- = 0; + tag = control; + control = p; + q = strchr(tag, ':'); + if (!q || q - tag < 4) + continue; + *q++ = 0; + while (*q == ' ' || *q == '\t') + q++; + x = '@' + (tag[0] & 0x1f); + x = (x << 8) + '@' + (tag[1] & 0x1f); + switch(x) + { + case 'A' << 8 | 'R': + if (!strcasecmp(tag, "architecture")) + s->arch = str2id(pool, q, 1); + break; + case 'B' << 8 | 'R': + if (!strcasecmp(tag, "breaks")) + s->conflicts = makedeps(repo, q, s->conflicts, 0); + break; + case 'C' << 8 | 'O': + if (!strcasecmp(tag, "conflicts")) + s->conflicts = makedeps(repo, q, s->conflicts, 0); + break; + case 'D' << 8 | 'E': + if (!strcasecmp(tag, "depends")) + s->requires = makedeps(repo, q, s->requires, -SOLVABLE_PREREQMARKER); + else if (!strcasecmp(tag, "description")) + { + char *ld = strchr(q, '\n'); + if (ld) + { + *ld++ = 0; + repodata_set_str(data, s - pool->solvables, SOLVABLE_DESCRIPTION, ld); + } + else + repodata_set_str(data, s - pool->solvables, SOLVABLE_DESCRIPTION, q); + repodata_set_str(data, s - pool->solvables, SOLVABLE_SUMMARY, q); + } + break; + case 'E' << 8 | 'N': + if (!strcasecmp(tag, "enhances")) + s->enhances = makedeps(repo, q, s->enhances, 0); + break; + case 'I' << 8 | 'N': + if (!strcasecmp(tag, "installed-size")) + repodata_set_num(data, s - pool->solvables, SOLVABLE_INSTALLSIZE, atoi(q)); + break; + case 'P' << 8 | 'A': + if (!strcasecmp(tag, "package")) + s->name = str2id(pool, q, 1); + break; + case 'P' << 8 | 'R': + if (!strcasecmp(tag, "pre-depends")) + s->requires = makedeps(repo, q, s->requires, SOLVABLE_PREREQMARKER); + else if (!strcasecmp(tag, "provides")) + s->provides = makedeps(repo, q, s->provides, 0); + break; + case 'R' << 8 | 'E': + if (!strcasecmp(tag, "replaces")) + s->obsoletes = makedeps(repo, q, s->conflicts, 0); + else if (!strcasecmp(tag, "recommends")) + s->recommends = makedeps(repo, q, s->recommends, 0); + break; + case 'S' << 8 | 'U': + if (!strcasecmp(tag, "suggests")) + s->suggests = makedeps(repo, q, s->suggests, 0); + break; + case 'V' << 8 | 'E': + if (!strcasecmp(tag, "version")) + s->evr = str2id(pool, q, 1); + break; + } + } } void @@ -231,9 +427,10 @@ repo_add_debs(Repo *repo, const char **debs, int ndebs, int flags) ctar = sat_realloc(ctar, l2 + 1); ctar[l2] = 0; s = pool_id2solvable(pool, repo_add_solvable(repo)); - control2solvable(s, (char *)ctar); + control2solvable(s, data, (char *)ctar); repodata_set_location(data, s - pool->solvables, 0, 0, debs[i]); - repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, (unsigned int)((stb.st_size + 1023) / 1024)); + if (S_ISREG(stb.st_mode)) + repodata_set_num(data, s - pool->solvables, SOLVABLE_DOWNLOADSIZE, (unsigned int)((stb.st_size + 1023) / 1024)); if (gotpkgid) repodata_set_bin_checksum(data, s - pool->solvables, SOLVABLE_PKGID, REPOKEY_TYPE_MD5, pkgid); sat_free(ctar); @@ -241,13 +438,3 @@ repo_add_debs(Repo *repo, const char **debs, int ndebs, int flags) if (!(flags & REPO_NO_INTERNALIZE)) repodata_internalize(data); } - -int -main(int argc, const char **argv) -{ - Pool *pool = pool_create(); - Repo *repo = repo_create(pool, "debs2solv"); - repo_add_debs(repo, argv + 1, argc - 1, DEBS_ADD_WITH_PKGID); - repo_write(repo, stdout, 0, 0, 0); - 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] <libzypp> master : Adapt to changed satsolver api.
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/master commit 50c8f37d6190c43a95049c6a5378d4b8405ac8bc Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 13:00:14 2009 +0200 Adapt to changed satsolver api. --- zypp/sat/LookupAttr.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index f184502..750b081 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -541,7 +541,7 @@ namespace zypp case REPOKEY_TYPE_IDARRAY: case REPOKEY_TYPE_CONSTANTID: { - detail::IdType id = ::repodata_globalize_id( _dip->data, _dip->kv.id ); + detail::IdType id = ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ); return ISRELDEP(id) ? Capability( id ).asString() : IdString( id ).asString(); } @@ -595,7 +595,7 @@ namespace zypp case REPOKEY_TYPE_ID: case REPOKEY_TYPE_IDARRAY: case REPOKEY_TYPE_CONSTANTID: - return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id ) ); + return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ) ); break; } } @@ -671,7 +671,7 @@ namespace zypp detail::IdType LookupAttr::iterator::dereference() const { - return _dip ? ::repodata_globalize_id( _dip->data, _dip->kv.id ) + return _dip ? ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ) : detail::noId; } -- 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] <libzypp> ma-misc : Adapt to changed satsolver api.
by Michael Andres 30 Jun '09

30 Jun '09

ref: refs/heads/ma-misc commit 50c8f37d6190c43a95049c6a5378d4b8405ac8bc Author: Michael Andres <ma(a)suse.de> Date: Tue Jun 30 13:00:14 2009 +0200 Adapt to changed satsolver api. --- zypp/sat/LookupAttr.cc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index f184502..750b081 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -541,7 +541,7 @@ namespace zypp case REPOKEY_TYPE_IDARRAY: case REPOKEY_TYPE_CONSTANTID: { - detail::IdType id = ::repodata_globalize_id( _dip->data, _dip->kv.id ); + detail::IdType id = ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ); return ISRELDEP(id) ? Capability( id ).asString() : IdString( id ).asString(); } @@ -595,7 +595,7 @@ namespace zypp case REPOKEY_TYPE_ID: case REPOKEY_TYPE_IDARRAY: case REPOKEY_TYPE_CONSTANTID: - return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id ) ); + return IdString( ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ) ); break; } } @@ -671,7 +671,7 @@ namespace zypp detail::IdType LookupAttr::iterator::dereference() const { - return _dip ? ::repodata_globalize_id( _dip->data, _dip->kv.id ) + return _dip ? ::repodata_globalize_id( _dip->data, _dip->kv.id, 1 ) : detail::noId; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0