October 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r11565 - in /trunk/libzypp: devel/devel.ma/TransList.cc zypp/parser/ProductFileReader.cc
by mlandres＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlandres Date: Fri Oct 31 18:10:59 2008 New Revision: 11565 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11565&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/TransList.cc trunk/libzypp/zypp/parser/ProductFileReader.cc Modified: trunk/libzypp/devel/devel.ma/TransList.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/TransList… ============================================================================== --- trunk/libzypp/devel/devel.ma/TransList.cc (original) +++ trunk/libzypp/devel/devel.ma/TransList.cc Fri Oct 31 18:10:59 2008 @@ -196,15 +196,11 @@ { Measure x( "PARSE" ); - parser::ProductFileData val; std::vector<parser::ProductFileData> result; - - parser::ProductFileReader::scanDir( functor::getFirst( val ), - //functor::getAll( std::back_inserter( result ) ), + parser::ProductFileReader::scanDir( functor::getAll( std::back_inserter( result ) ), sysRoot / "etc/products.d" ); - USR << val << endl; - USR << result << endl; + MIL << "Products: " << result << endl; } #if 0 Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.cc (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.cc Fri Oct 31 18:10:59 2008 @@ -101,12 +101,17 @@ obj.edition().c_str(), obj.arch().c_str(), obj.vendor().c_str() ); + if ( ! obj.upgrades().empty() ) + { + for_( it, obj.upgrades().begin(), obj.upgrades().end() ) + str << endl << " " << *it; + } return str; } std::ostream & operator<<( std::ostream & str, const ProductFileData::Upgrade & obj ) { - str << str::form( " |upgrade|%s|", + str << str::form( "|upgrade|%s|", obj.name().c_str() ); return str; } -- 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] r11564 - in /trunk/libzypp/zypp/parser: ProductFileReader.cc ProductFileReader.h
by mlandres＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlandres Date: Fri Oct 31 18:03:56 2008 New Revision: 11564 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11564&view=rev Log: Update ProductFileReader Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc trunk/libzypp/zypp/parser/ProductFileReader.h Modified: trunk/libzypp/zypp/parser/ProductFileReader.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.cc (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.cc Fri Oct 31 18:03:56 2008 @@ -18,6 +18,7 @@ #include "zypp/parser/ProductFileReader.h" #include "zypp/parser/xml/ParseDef.h" +#include "zypp/parser/xml/ParseDefConsume.h" #include "zypp/parser/xml/Reader.h" using std::endl; @@ -95,81 +96,141 @@ std::ostream & operator<<( std::ostream & str, const ProductFileData & obj ) { - str << str::form( "|product|%s|%s|%s|%s|%p", + str << str::form( "|product|%s|%s|%s|%s|", obj.name().c_str(), obj.edition().c_str(), obj.arch().c_str(), - obj.vendor().c_str(), (const void *)&obj ); + obj.vendor().c_str() ); return str; } + std::ostream & operator<<( std::ostream & str, const ProductFileData::Upgrade & obj ) + { + str << str::form( " |upgrade|%s|", + obj.name().c_str() ); + return str; + } ///////////////////////////////////////////////////////////////// // // class ProductFileReader // ///////////////////////////////////////////////////////////////// - bool consumeNode( xml::Reader & reader_r ) + /** Assign types constructible from \c char* */ + template <class _Val> + struct ConsumeVal : public xml::ParseDefConsume { - //DBG << *reader_r << endl; - return true; - } + ConsumeVal( _Val & value_r ) + : _value( &value_r ) + {} - struct ProductNode : public xml::ParseDef - { - ProductNode( Mode mode_r ) - : ParseDef( "product", mode_r ) + virtual void text( const xml::Node & node_r ) { - (*this)("ident", OPTIONAL) - ("onsys", OPTIONAL) - ; - - (*this)["ident"] - ("name", OPTIONAL) - ("version", OPTIONAL) - ("description", OPTIONAL) - ("created", OPTIONAL) - ; - - (*this)["onsys"] - ("entry", MULTIPLE_OPTIONAL) - ; + *_value = _Val( node_r.value().c_str() ); } + + private: + _Val * _value; + }; + + template <class _Val> + shared_ptr<xml::ParseDefConsume> consumeVal( _Val & value_r ) + { return shared_ptr<xml::ParseDefConsume>( new ConsumeVal<_Val>( value_r ) ); } + + ///////////////////////////////////////////////////////////////// + + struct ProductNode : public xml::ParseDef, public xml::ParseDefConsume + { + ProductNode( ProductFileData::Impl & pdata_r ) + : ParseDef( "product", MANDTAORY ) + , _pdata( pdata_r ) + { + (*this) + ("vendor", OPTIONAL, consumeVal( _pdata._vendor ) ) + ("name", MANDTAORY, consumeVal( _pdata._name ) ) + ("version", OPTIONAL, consumeVal( _version ) ) + ("release", OPTIONAL, consumeVal( _release ) ) + ("arch", OPTIONAL, consumeVal( _pdata._arch ) ) + ("productline", OPTIONAL, consumeVal( _pdata._productline ) ) + ("register", OPTIONAL) + ("updaterepokey", OPTIONAL, consumeVal( _pdata._updaterepokey ) ) + ("upgrades", OPTIONAL) + ; + + (*this)["register"] + ("target", OPTIONAL, consumeVal( _pdata._registerTarget ) ) + ("release", OPTIONAL, consumeVal( _pdata._registerRelease ) ) + ; + + (*this)["upgrades"] + ("upgrade", MULTIPLE_OPTIONAL) + ; + + (*this)["upgrades"]["upgrade"] + ("name", OPTIONAL, consumeVal( _upgrade._name ) ) + ("summary", OPTIONAL, consumeVal( _upgrade._summary ) ) + ("repository", OPTIONAL, consumeVal( _upgrade._product ) ) + ("notify", OPTIONAL) // need consume to bool! + ("status", OPTIONAL, consumeVal( _upgrade._status ) ) + ; + + // not a clean way to collect the END_ELEMENT calls, but + // works for this case. NEEDS CLEANUP! + setConsumer( *this ); + (*this)["upgrades"].setConsumer( *this ); + } + + virtual void done ( const xml::Node & _node ) + { + //SEC << "DONE.... " << _node.localName() << endl; + if ( _node.localName() == name() ) + { + // this END node + _pdata._edition = Edition( _version, _release ); + } + else if ( _node.localName() == "upgrade" ) + { + // collect upgrade + ProductFileData::Upgrade cdata( new ProductFileData::Upgrade::Impl( _upgrade ) ); + _pdata._upgrades.push_back( cdata ); + } + } + + ProductFileData::Impl & _pdata; + + std::string _version; + std::string _release; + + ProductFileData::Upgrade::Impl _upgrade; }; bool ProductFileReader::parse( const InputStream & input_r ) const { MIL << "+++" << input_r << endl; bool ret = true; - xml::ParseDef::_debug = true; - - xml::Reader reader( input_r ); - ProductNode rootNode( xml::ParseDef::MANDTAORY ); - rootNode.take( reader ); - ret = false; - - MIL << "---" << ret << " - " << input_r << endl; - return ret; + ProductFileData::Impl * pdataImpl = 0; + ProductFileData pdata( (pdataImpl = new ProductFileData::Impl) ); try { + //xml::ParseDef::_debug = true; xml::Reader reader( input_r ); - ret = reader.foreachNode( consumeNode ); + ProductNode rootNode( *pdataImpl ); + rootNode.take( reader ); + } catch ( const Exception & err ) { // parse error ERR << err << endl; + ERR << "---" << ret << " - " << input_r << endl; + return ret; } if ( _consumer ) { - static unsigned idx = 0; - - ProductFileData::Impl * i = new ProductFileData::Impl; - i->_name = IdString( str::numstring( ++idx, 4 ) ); - ret = _consumer( i ); + ret = _consumer( pdata ); } MIL << "---" << ret << " - " << input_r << endl; Modified: trunk/libzypp/zypp/parser/ProductFileReader.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/ProductFileR… ============================================================================== --- trunk/libzypp/zypp/parser/ProductFileReader.h (original) +++ trunk/libzypp/zypp/parser/ProductFileReader.h Fri Oct 31 18:03:56 2008 @@ -94,6 +94,9 @@ /** \relates ProductFileData Stream output */ std::ostream & operator<<( std::ostream & str, const ProductFileData & obj ); + /** \relates ProductFileData::Upgrade Stream output */ + std::ostream & operator<<( std::ostream & str, const ProductFileData::Upgrade & obj ); + /////////////////////////////////////////////////////////////////// // // CLASS NAME : ProductFileReader -- 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] r11563 - in /trunk/libzypp/zypp/parser/xml: ParseDef.cc ParseDef.h ParseDefConsume.cc
by mlandres＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlandres Date: Fri Oct 31 18:03:28 2008 New Revision: 11563 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11563&view=rev Log: Allow to define consumer in ctor Modified: trunk/libzypp/zypp/parser/xml/ParseDef.cc trunk/libzypp/zypp/parser/xml/ParseDef.h trunk/libzypp/zypp/parser/xml/ParseDefConsume.cc Modified: trunk/libzypp/zypp/parser/xml/ParseDef.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/xml/ParseDef… ============================================================================== --- trunk/libzypp/zypp/parser/xml/ParseDef.cc (original) +++ trunk/libzypp/zypp/parser/xml/ParseDef.cc Fri Oct 31 18:03:28 2008 @@ -132,11 +132,14 @@ typedef std::map<std::string, ImplPtr> SubNodes; public: - Impl( const std::string & name_r, Mode mode_r ) + Impl( const std::string & name_r, Mode mode_r, const shared_ptr<ParseDefConsume> & target_r = shared_ptr<ParseDefConsume>() ) : _name( name_r ) , _mode( mode_r ) , _parent( NULL ) - {} + { + if ( target_r ) + _callback.setRedirect( target_r ); + } ~Impl() { @@ -286,7 +289,8 @@ } else { - WAR << "Skip unknown node " << *reader_r << " in "<< *this << endl; + if ( ParseDef::_debug ) + WAR << "Skip unknown node " << *reader_r << " in "<< *this << endl; skipNode( reader_r ); } } @@ -384,6 +388,10 @@ : _pimpl( new Impl( name_r, mode_r ) ) {} + ParseDef::ParseDef( const std::string & name_r, Mode mode_r, const shared_ptr<ParseDefConsume> & target_r ) + : _pimpl( new Impl( name_r, mode_r, target_r ) ) + {} + ParseDef::ParseDef( const shared_ptr<Impl> & pimpl_r ) : _pimpl( pimpl_r ) {} Modified: trunk/libzypp/zypp/parser/xml/ParseDef.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/xml/ParseDef… ============================================================================== --- trunk/libzypp/zypp/parser/xml/ParseDef.h (original) +++ trunk/libzypp/zypp/parser/xml/ParseDef.h Fri Oct 31 18:03:28 2008 @@ -140,6 +140,7 @@ public: ParseDef( const std::string & name_r, Mode mode_r ); + ParseDef( const std::string & name_r, Mode mode_r, const shared_ptr<ParseDefConsume> & target_r ); virtual ~ParseDef(); @@ -166,6 +167,9 @@ ParseDef & addNode( const std::string & name_r, Mode mode_r ) { ParseDef tmp( name_r, mode_r ); return addNode( tmp ); } + ParseDef & addNode( const std::string & name_r, Mode mode_r, const shared_ptr<ParseDefConsume> & target_r ) + { ParseDef tmp( name_r, mode_r, target_r ); return addNode( tmp ); } + /** Add subnode definition. * \see addNode. */ @@ -175,6 +179,9 @@ ParseDef & operator()( const std::string & name_r, Mode mode_r ) { return addNode( name_r, mode_r ); } + ParseDef & operator()( const std::string & name_r, Mode mode_r, const shared_ptr<ParseDefConsume> & target_r ) + { return addNode( name_r, mode_r, target_r ); } + /** Get subnode by name. * \throws ParseDefBuildException if no subnode with \a name_r exists. */ Modified: trunk/libzypp/zypp/parser/xml/ParseDefConsume.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/xml/ParseDef… ============================================================================== --- trunk/libzypp/zypp/parser/xml/ParseDefConsume.cc (original) +++ trunk/libzypp/zypp/parser/xml/ParseDefConsume.cc Fri Oct 31 18:03:28 2008 @@ -117,7 +117,7 @@ void ParseDefConsumeRedirect::doneSubnode ( const Node & _node ) { if ( _target ) - _target->startSubnode( _node ); + _target->doneSubnode( _node ); } /////////////////////////////////////////////////////////////////// -- 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] r11562 - /trunk/sat-solver/tools/rpmdb2solv.c
by mlschroe＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlschroe Date: Fri Oct 31 16:12:00 2008 New Revision: 11562 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11562&view=rev Log: - add '-o <outfile>' support Modified: trunk/sat-solver/tools/rpmdb2solv.c Modified: trunk/sat-solver/tools/rpmdb2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmdb2solv.c?re… ============================================================================== --- trunk/sat-solver/tools/rpmdb2solv.c (original) +++ trunk/sat-solver/tools/rpmdb2solv.c Fri Oct 31 16:12:00 2008 @@ -60,12 +60,13 @@ const char *basefile = 0; char *proddir = 0; const char *attribute = 0; + char *outfile = 0; /* * parse arguments */ - while ((c = getopt(argc, argv, "Pa:hnxb:r:p:")) >= 0) + while ((c = getopt(argc, argv, "Pa:hnxb:r:p:o:")) >= 0) switch (c) { case 'h': @@ -92,10 +93,19 @@ case 'x': extrapool = 1; break; + case 'o': + outfile = optarg; + break; default: usage(1); } + if (outfile && !freopen(outfile, "w", stdout)) + { + perror(outfile); + exit(1); + } + /* * ??? */ -- 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] r11561 - in /trunk/sat-solver/tools: repo_rpmdb.c repo_rpmdb.h rpmdb2solv.c
by mlschroe＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlschroe Date: Fri Oct 31 16:08:13 2008 New Revision: 11561 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11561&view=rev Log: - add "-P" option to rpmdb2solv, prints percentage on stderr Modified: trunk/sat-solver/tools/repo_rpmdb.c trunk/sat-solver/tools/repo_rpmdb.h trunk/sat-solver/tools/rpmdb2solv.c Modified: trunk/sat-solver/tools/repo_rpmdb.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.c (original) +++ trunk/sat-solver/tools/repo_rpmdb.c Fri Oct 31 16:08:13 2008 @@ -1174,6 +1174,50 @@ memcpy(cookie + 24, &st->st_dev, sizeof(st->st_dev)); } +static int +count_headers(const char *rootdir, DB_ENV *dbenv) +{ + char dbpath[PATH_MAX]; + struct stat statbuf; + int byteswapped; + DB *db = 0; + DBC *dbc = 0; + int count = 0; + DBT dbkey; + DBT dbdata; + + snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm/Name", rootdir); + if (stat(dbpath, &statbuf)) + return 0; + memset(&dbkey, 0, sizeof(dbkey)); + memset(&dbdata, 0, sizeof(dbdata)); + if (db_create(&db, dbenv, 0)) + { + perror("db_create"); + exit(1); + } + if (db->open(db, 0, dbpath, 0, DB_HASH, DB_RDONLY, 0664)) + { + perror("db->open var/lib/rpm/Name"); + exit(1); + } + if (db->get_byteswapped(db, &byteswapped)) + { + perror("db->get_byteswapped"); + exit(1); + } + if (db->cursor(db, NULL, &dbc, 0)) + { + perror("db->cursor"); + exit(1); + } + while (dbc->c_get(dbc, &dbkey, &dbdata, DB_NEXT) == 0) + count += dbdata.size >> 3; + dbc->c_close(dbc); + db->close(db, 0); + return count; +} + /* * read rpm db as repo * @@ -1206,6 +1250,7 @@ const unsigned char *oldcookie = 0; Id oldcookietype = 0; Repodata *data; + int count = 0, done = 0; memset(&dbkey, 0, sizeof(dbkey)); memset(&dbdata, 0, sizeof(dbdata)); @@ -1254,6 +1299,9 @@ if (!ref || !oldcookie || oldcookietype != REPOKEY_TYPE_SHA256 || memcmp(oldcookie, newcookie, 32) != 0) { Id *pkgids; + + if ((flags & RPMDB_REPORT_PROGRESS) != 0) + count = count_headers(rootdir, dbenv); if (db->open(db, 0, dbpath, 0, DB_HASH, DB_RDONLY, 0664)) { perror("db->open var/lib/rpm/Packages"); @@ -1327,6 +1375,13 @@ memset(s, 0, sizeof(*s)); s->repo = repo; } + if ((flags & RPMDB_REPORT_PROGRESS) != 0) + { + if (done < count) + done++; + if (done < count && (done - 1) * 100 / count != done * 100 / count) + pool_debug(pool, SAT_ERROR, "%%%% %d\n", done * 100 / count); + } } if (s) { @@ -1415,7 +1470,6 @@ /* sort rpmids */ qsort(rpmids, nrpmids, sizeof(*rpmids), rpmids_sort_cmp); - rp = rpmids; dbidp = (unsigned char *)&dbid; rpmheadsize = 0; rpmhead = 0; @@ -1432,12 +1486,34 @@ h = (h + 317) & refmask; refhash[h] = i + 1; /* make it non-zero */ } + + /* count the misses, they will cost us time */ + if ((flags & RPMDB_REPORT_PROGRESS) != 0) + { + for (i = 0, rp = rpmids; i < nrpmids; i++, rp++) + { + dbid = rp->dbid; + if (refhash) + { + h = dbid & refmask; + while ((id = refhash[h])) + { + if (ref->rpmdbid[id - 1] == dbid) + break; + h = (h + 317) & refmask; + } + if (id) + continue; + } + count++; + } + } s = pool_id2solvable(pool, repo_add_solvable_block(repo, nrpmids)); if (!repo->rpmdbid) repo->rpmdbid = repo_sidedata_create(repo, sizeof(Id)); - for (i = 0; i < nrpmids; i++, rp++, s++) + for (i = 0, rp = rpmids; i < nrpmids; i++, rp++, s++) { dbid = rp->dbid; repo->rpmdbid[(s - pool->solvables) - repo->start] = dbid; @@ -1517,6 +1593,13 @@ rpmhead->dp = rpmhead->data + rpmhead->cnt * 16; rpm2solv(pool, repo, data, s, rpmhead); + if ((flags & RPMDB_REPORT_PROGRESS) != 0) + { + if (done < count) + done++; + if (done < count && (done - 1) * 100 / count != done * 100 / count) + pool_debug(pool, SAT_ERROR, "%%%% %d\n", done * 100 / count); + } } if (refhash) @@ -1535,6 +1618,8 @@ if (db) db->close(db, 0); dbenv->close(dbenv, 0); + if ((flags & RPMDB_REPORT_PROGRESS) != 0) + pool_debug(pool, SAT_ERROR, "%%%% 100\n"); } Modified: trunk/sat-solver/tools/repo_rpmdb.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.h?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmdb.h (original) +++ trunk/sat-solver/tools/repo_rpmdb.h Fri Oct 31 16:08:13 2008 @@ -7,3 +7,5 @@ extern void repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir, int flags); extern void repo_add_rpms(Repo *repo, const char **rpms, int nrpms, int flags); + +#define RPMDB_REPORT_PROGRESS (1 << 8) Modified: trunk/sat-solver/tools/rpmdb2solv.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/rpmdb2solv.c?re… ============================================================================== --- trunk/sat-solver/tools/rpmdb2solv.c (original) +++ trunk/sat-solver/tools/rpmdb2solv.c Fri Oct 31 16:08:13 2008 @@ -53,7 +53,7 @@ Repodata *data; FILE *fp; Pool *refpool; - int c; + int c, percent = 0; int extrapool = 0; int nopacks = 0; const char *root = 0; @@ -65,7 +65,7 @@ * parse arguments */ - while ((c = getopt (argc, argv, "a:hnxb:r:p:")) >= 0) + while ((c = getopt(argc, argv, "Pa:hnxb:r:p:")) >= 0) switch (c) { case 'h': @@ -83,6 +83,9 @@ case 'n': nopacks = 1; break; + case 'P': + percent = 1; + break; case 'p': proddir = optarg; break; @@ -125,7 +128,7 @@ data = repo_add_repodata(repo, 0); if (!nopacks) - repo_add_rpmdb(repo, ref, root, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE); + repo_add_rpmdb(repo, ref, root, REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE | (percent ? RPMDB_REPORT_PROGRESS : 0)); if (proddir && *proddir) { -- 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] r11560 - /trunk/sat-solver/src/repo.c
by mlschroe＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlschroe Date: Fri Oct 31 16:01:57 2008 New Revision: 11560 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11560&view=rev Log: - fix entry tests Modified: trunk/sat-solver/src/repo.c Modified: trunk/sat-solver/src/repo.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/repo.c?rev=11560&… ============================================================================== --- trunk/sat-solver/src/repo.c (original) +++ trunk/sat-solver/src/repo.c Fri Oct 31 16:01:57 2008 @@ -812,7 +812,7 @@ } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -834,13 +834,13 @@ if (keyname == RPM_RPMDBID) { - if (repo->rpmdbid && entry && entry >= repo->start && entry < repo->end) + if (repo->rpmdbid && entry >= repo->start && entry < repo->end) return repo->rpmdbid[entry - repo->start]; return notfound; } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -879,7 +879,7 @@ } for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -907,7 +907,7 @@ int i, j; for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; @@ -932,7 +932,7 @@ int i, j; for (i = 0, data = repo->repodata; i < repo->nrepodata; i++, data++) { - if (entry && (entry < data->start || entry >= data->end)) + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) continue; if (!repodata_precheck_keyname(data, keyname)) continue; -- 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] r11559 - /trunk/libzypp/zypp/Arch.cc
by mlandres＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlandres Date: Fri Oct 31 15:28:03 2008 New Revision: 11559 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11559&view=rev Log: Test size of Arch CompatBits. Modified: trunk/libzypp/zypp/Arch.cc Modified: trunk/libzypp/zypp/Arch.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Arch.cc?rev=11559&r… ============================================================================== --- trunk/libzypp/zypp/Arch.cc (original) +++ trunk/libzypp/zypp/Arch.cc Fri Oct 31 15:28:03 2008 @@ -13,6 +13,7 @@ #include <list> #include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" #include "zypp/base/NonCopyable.h" #include "zypp/base/Tr1hash.h" #include "zypp/Arch.h" @@ -37,6 +38,7 @@ { /** Bitfield for architecture IDs and compatBits relation. * \note Need one bit for each builtin Arch. + * \todo Migrate to some infinite BitField */ typedef bit::BitField<uint64_t> CompatBits; @@ -150,6 +152,9 @@ // NOTE: Builtin CLASS Arch CONSTANTS are defined below. // You have to change them accordingly. // + // NOTE: Thake care CompatBits::IntT is able to provide one + // bit for each architectue. + // #define DEF_BUILTIN(A) const IdString _##A( #A ); DEF_BUILTIN( noarch ); @@ -313,7 +318,7 @@ defCompatibleWith( _sh4a, _noarch,_sh4 ); // /////////////////////////////////////////////////////////////////// - //dumpOn( USR ) << endl; + // dumpOn( USR ) << endl; } private: @@ -324,8 +329,13 @@ */ CompatBits::IntT nextIdBit() const { + if ( CompatBits::size == _compatSet.size() ) + { + // Provide more bits in CompatBits::IntT + INT << "Need more than " << CompatBits::size << " bits to encode architectures." << endl; + ZYPP_THROW( Exception("Need more bits to encode architectures.") ); + } CompatBits::IntT nextBit = CompatBits::IntT(1) << (_compatSet.size()); - assert( nextBit ); // need more bits in CompatBits::IntT return nextBit; } -- 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] r11558 - in /trunk/libzypp: package/libzypp.changes zypp/ResStatus.h zypp/pool/PoolImpl.h
by mlandres＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: mlandres Date: Fri Oct 31 14:08:06 2008 New Revision: 11558 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11558&view=rev Log: - Do not save solver locks (by APPL_HIGH). Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/ResStatus.h trunk/libzypp/zypp/pool/PoolImpl.h 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 Fri Oct 31 14:08:06 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 31 14:01:57 CET 2008 - ma(a)suse.de + +- Do not save solver locks (by APPL_HIGH). +- revision 11558 + +------------------------------------------------------------------- Fri Oct 31 13:53:39 CET 2008 - dmacvicar(a)suse.de - fetcher.setOptions( Fetcher::AutoAddIndexes ) allows Modified: trunk/libzypp/zypp/ResStatus.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ResStatus.h?rev=115… ============================================================================== --- trunk/libzypp/zypp/ResStatus.h (original) +++ trunk/libzypp/zypp/ResStatus.h Fri Oct 31 14:08:06 2008 @@ -253,6 +253,9 @@ bool isLocked() const { return fieldValueIs<TransactField>( LOCKED ); } + bool isUserLocked() const + { return isLocked() && isByUser(); } + bool isSoftLocked( TransactByValue causer_r = USER ) const { return isKept() && fieldValueIs<TransactByField>( causer_r ); } Modified: trunk/libzypp/zypp/pool/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/pool/PoolImpl.h?rev… ============================================================================== --- trunk/libzypp/zypp/pool/PoolImpl.h (original) +++ trunk/libzypp/zypp/pool/PoolImpl.h Fri Oct 31 14:08:06 2008 @@ -61,9 +61,10 @@ /** Test whether the lock status differs from the remembered UserLockQuery bit. */ static int diffLock( const ResStatus & status_r ) { - if ( status_r.isLocked() == status_r.isUserLockQueryMatch() ) + bool userLock( status_r.isUserLocked() ); + if ( userLock == status_r.isUserLockQueryMatch() ) return 0; - return status_r.isLocked() ? 1 : -1; + return userLock ? 1 : -1; } }; -- 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] r11557 - /trunk/libzypp/tests/zypp/CMakeLists.txt
by dmacvicar＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: dmacvicar Date: Fri Oct 31 14:07:23 2008 New Revision: 11557 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11557&view=rev Log: not official test Modified: trunk/libzypp/tests/zypp/CMakeLists.txt Modified: trunk/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/zypp/CMakeLists.tx… ============================================================================== --- trunk/libzypp/tests/zypp/CMakeLists.txt (original) +++ trunk/libzypp/tests/zypp/CMakeLists.txt Fri Oct 31 14:07:23 2008 @@ -24,7 +24,6 @@ RWPtr RepoInfo RepoManager - Reports RepoStatus ResKind ResStatus -- 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] r11556 - /trunk/libzypp/package/libzypp.changes
by dmacvicar＠svn.opensuse.org 31 Oct '08

31 Oct '08

Author: dmacvicar Date: Fri Oct 31 13:54:41 2008 New Revision: 11556 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11556&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 Fri Oct 31 13:54:41 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Oct 31 13:53:39 CET 2008 - dmacvicar(a)suse.de + +- fetcher.setOptions( Fetcher::AutoAddIndexes ) allows + for automatic signed index discovery. +- enqueueDir with checksum checking s now enqueueDigestedDir + +------------------------------------------------------------------- Thu Oct 30 14:24:57 CET 2008 - schubi(a)suse.de - solutions: keep/lock will be done by APPL_HIGH. So they will not be -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0