September 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r7116 - in /trunk/libzypp: tests/cache/CacheStore_test.cc tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en zypp/cache/CacheStore.cc zypp/cache/ResolvableQuery.cc
by dmacvicar＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: dmacvicar Date: Thu Sep 6 02:23:59 2007 New Revision: 7116 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7116&view=rev Log: - Fix for bug #307163 - empty package descriptions a.k.a shared tag not 100% implemented Note: calling the same query in recursive manner is tricky. All the tips to get my testcase to pass, where here: http://www.sqlite.org/cvstrac/wiki?p=LibraryRoutineCalledOutOfSequence Modified: trunk/libzypp/tests/cache/CacheStore_test.cc trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en trunk/libzypp/zypp/cache/CacheStore.cc trunk/libzypp/zypp/cache/ResolvableQuery.cc Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu Sep 6 02:23:59 2007 @@ -415,7 +415,11 @@ Package::Ptr p = asKind<Package>(*it); if ( (p->name() == "foo") && p->arch() == Arch("x86_64") ) { - BOOST_CHECK_EQUAL( p->description(), "foo bar"); + BOOST_CHECK_EQUAL( p->description(), "This is the description"); + } + if ( (p->name() == "foo") && p->arch() == Arch("i586") ) + { + BOOST_CHECK_EQUAL( p->description(), "This is the description"); } } } Modified: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data… ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en (original) +++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en Thu Sep 6 02:23:59 2007 @@ -2,7 +2,6 @@ =Pkg: foo 1.0 1 i586 =Sum: Foo program +Des: - -This package contains foo +This is the description -Des: ##---------------------------------------- Modified: trunk/libzypp/zypp/cache/CacheStore.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/CacheStore.cc… ============================================================================== --- trunk/libzypp/zypp/cache/CacheStore.cc (original) +++ trunk/libzypp/zypp/cache/CacheStore.cc Thu Sep 6 02:23:59 2007 @@ -275,7 +275,7 @@ const data::Package_Ptr & package ) { RecordId id = appendResolvable( repository_id, ResTraits<Package>::kind, - NVRA( package->name, package->edition, package->arch ), package->deps ); + NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith ); appendResObjectAttributes( id, package ); appendPackageBaseAttributes( id, package ); @@ -292,7 +292,7 @@ const data::SrcPackage_Ptr & package ) { RecordId id = appendResolvable( repository_id, ResTraits<SrcPackage>::kind, - NVRA( package->name, package->edition, package->arch ), package->deps ); + NVRA( package->name, package->edition, package->arch ), package->deps, package->shareDataWith ); appendResObjectAttributes( id, package ); appendOnMediaLocation( id, attrSrcPackageLocation, package->repositoryLocation ); Modified: trunk/libzypp/zypp/cache/ResolvableQuery.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/cache/ResolvableQue… ============================================================================== --- trunk/libzypp/zypp/cache/ResolvableQuery.cc (original) +++ trunk/libzypp/zypp/cache/ResolvableQuery.cc Thu Sep 6 02:23:59 2007 @@ -25,6 +25,7 @@ sqlite3_command_ptr _cmd_attr_tstr; sqlite3_command_ptr _cmd_attr_num; sqlite3_command_ptr _cmd_disk_usage; + sqlite3_command_ptr _cmd_shared_id; Impl( const Pathname &dbdir) : _dbdir(dbdir) @@ -33,6 +34,8 @@ _con.open((dbdir + "zypp.db").asString().c_str()); _con.executenonquery("PRAGMA cache_size=8000;"); + _cmd_shared_id.reset( new sqlite3_command( _con, "select shared_id from resolvables where id=:rid;") ); + _cmd_attr_tstr.reset( new sqlite3_command( _con, "select a.text, l.name from text_attributes a,types l,types t where a.weak_resolvable_id=:rid and a.lang_id=l.id and a.attr_id=t.id and l.class=:lclass and t.class=:tclass and t.name=:tname;") ); @@ -322,6 +325,18 @@ sqlite3_reader reader = _cmd_attr_num->executereader(); if ( reader.read() ) return reader.getint(0); + else + { + reader.close(); + sqlite3_reader idreader = _cmd_shared_id->executereader(); + if ( idreader.read() ) + { + _cmd_shared_id->bind(":rid", record_id); + data::RecordId sid = idreader.getint(0); + idreader.close(); + return queryNumericAttributeInternal(con, sid, klass, name, default_value); + } + } return default_value; } @@ -353,7 +368,19 @@ if ( c>0 ) return result; - + else + { + reader.close(); + _cmd_shared_id->bind(":rid", record_id); + sqlite3_reader idreader = _cmd_shared_id->executereader(); + if ( idreader.read() ) + { + data::RecordId sid = idreader.getint(0); + idreader.close(); + return queryTranslatedStringAttributeInternal(con, sid, klass, name, default_value); + } + } + return default_value; } @@ -388,7 +415,19 @@ if ( reader.read() ) return reader.getstring(0); - + else + { + reader.close(); + _cmd_shared_id->bind(":rid", record_id); + sqlite3_reader idreader = _cmd_shared_id->executereader(); + if ( idreader.read() ) + { + data::RecordId sid = idreader.getint(0); + idreader.close(); + return queryStringAttributeTranslationInternal( con, sid, locale, klass, name, default_value ); + } + } + return default_value; } }; -- 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] r7115 - in /trunk/libzypp/tests: cache/ repo/susetags/data/shared_attributes/ repo/susetags/data/shared_attributes/suse/ repo/susetags/data/shared_attributes/suse/setup/ repo/susetags/data/shared_a...
by dmacvicar＠svn.opensuse.org 06 Sep '07

06 Sep '07

Author: dmacvicar Date: Thu Sep 6 02:23:51 2007 New Revision: 7115 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7115&view=rev Log: test case and reproduced bug # 307163 : empty package descriptions Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/ trunk/libzypp/tests/repo/susetags/data/shared_attributes/content trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en Modified: trunk/libzypp/tests/cache/CacheStore_test.cc Modified: trunk/libzypp/tests/cache/CacheStore_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/cache/CacheStore_t… ============================================================================== --- trunk/libzypp/tests/cache/CacheStore_test.cc (original) +++ trunk/libzypp/tests/cache/CacheStore_test.cc Thu Sep 6 02:23:51 2007 @@ -387,6 +387,41 @@ check_tables_clean(tmpdir); } +/** + * \short Test that a susetags repo reads shared attributes + */ +void cache_write_shared_attributes(const Pathname &repodir) +{ + ZConfig::instance().overrideSystemArchitecture( Arch( "x86_64" ) ); + data::RecordId repository_id; + filesystem::TmpDir tmpdir; + string alias = "novell.com"; + write_susetags_repo( alias, repodir, tmpdir ); + + ResStore dbres = get_resolvables( alias, tmpdir);; + //read_resolvables( alias, tmpdir, std::inserter(dbres, dbres.end())); + MIL << dbres.size() << " resolvables" << endl; + + // 2 packages and a product + BOOST_CHECK_EQUAL( dbres.size(), (unsigned)3); + + for ( ResStore::const_iterator it = dbres.begin(); + it != dbres.end(); + ++it ) + { + MIL << *it << endl; + if ( isKind<Package>(*it) ) + { + Package::Ptr p = asKind<Package>(*it); + if ( (p->name() == "foo") && p->arch() == Arch("x86_64") ) + { + BOOST_CHECK_EQUAL( p->description(), "foo bar"); + } + } + } + check_tables_clean(tmpdir); +} + void cache_write_susetags_normal_test(const std::string &dir) { Pathname repodir = Pathname(dir) + "/repo/susetags/data/stable-x86-subset"; @@ -399,6 +434,12 @@ cache_write_susetags(repodir); } +void cache_write_shared_attributes_test(const std::string &dir) +{ + Pathname repodir = Pathname(dir) + "/repo/susetags/data/shared_attributes"; + cache_write_shared_attributes(repodir); +} + test_suite* init_unit_test_suite( int argc, char *argv[] ) { @@ -437,8 +478,8 @@ (std::string const*)params, params+1)); test->add(BOOST_PARAM_TEST_CASE(&cache_write_susetags_gz_test, (std::string const*)params, params+1)); - //test->add(BOOST_PARAM_TEST_CASE(&cache_write_test2, - // (std::string const*)params, params+1)); + test->add(BOOST_PARAM_TEST_CASE(&cache_write_shared_attributes_test, + (std::string const*)params, params+1)); return test; } Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/content URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data… ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/shared_attributes/content (added) +++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/content Thu Sep 6 02:23:51 2007 @@ -0,0 +1,30 @@ +PRODUCT openSUSE-factory +VERSION 10.3 +DISTPRODUCT SuSE-Linux-STABLE-X86 +DISTVERSION 10.2.42-factory +VENDOR SUSE LINUX Products GmbH, Nuernberg, Germany +RELNOTESURL http://www.suse.com/relnotes/i386/openSUSE/FACTORY/release-notes.rpm +ARCH.x86_64 x86_64 i686 i586 i486 i386 noarch +ARCH.i686 i686 i586 i486 i386 noarch +ARCH.i586 i586 i486 i386 noarch +ARCH.i486 i486 i386 noarch +ARCH.i386 i386 noarch +DEFAULTBASE i586 +REQUIRES openSUSE-release = 10.3 pattern:basesystem +PROVIDES product:openSUSE = 10.2.42 +OBSOLETES product:SUSE_LINUX product:openSUSE <= 10.2 +LINGUAS cs da de en en_GB es fi fr hu it ja km nl nb pl pt_BR zh_CN zh_TW +SHORTLABEL FACTORY +LABEL openSUSE FACTORY 10.3 +LABEL.de openSUSE FACTORY 10.3 +EXTRAURLS http://download.opensuse.org/distribution/10.2/repo/oss/ +OPTIONALURLS http://download.opensuse.org/distribution/10.2/repo/non-oss/ http://download.opensuse.org/distribution/10.2/repo/debug/ +DESCRDIR suse/setup/descr +DATADIR suse +FLAGS update +LANGUAGE en_US +META SHA1 cec02abacb62fce2964a787d516879822691be6e packages +META SHA1 2664997a3bae2679cf1395a81d54a7dd4532c276 packages.DU +META SHA1 1c539c3fe4a8ec5fbe96ce3b559fc952124f9acd packages.en + + Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data… ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages (added) +++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages Thu Sep 6 02:23:51 2007 @@ -0,0 +1,32 @@ +##---------------------------------------- +=Pkg: foo 1.0 1 i586 +=Cks: SHA1 05f0647241433d01636785fd282cc824a6527269 ++Req: +bar > 1.0 +-Req: +=Grp: Bar +=Lic: BSD License and BSD-like, GNU General Public License (GPL) +=Src: foo 1.0 1 src +=Tim: 1183399094 +=Loc: 1 foo-1.0-1.i586.rpm +=Siz: 16356019 38850584 ++Aut: +Foo Bar <foo(a)bar.org> +-Aut: +##---------------------------------------- +=Pkg: foo 1.0 1 x86_64 +=Cks: SHA1 05f0647241433d01636785fd282cc824a6527269 ++Req: +bar > 1.0 +-Req: +=Grp: Bar +=Lic: BSD License and BSD-like, GNU General Public License (GPL) +=Src: foo 1.0 1 src +=Tim: 1183399094 +=Loc: 1 foo-1.0-1.x86_64.rpm +=Siz: 16356019 38850584 ++Aut: +Foo Bar <foo(a)bar.org> +-Aut: +=Shr: foo 1.0 1 i586 + Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data… ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU (added) +++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.DU Thu Sep 6 02:23:51 2007 @@ -0,0 +1,7 @@ +##---------------------------------------- +=Pkg: foo 1.0 1 i586 ++Dir: +/ 0 39444 0 3068 +usr/share/ 11 0 1 0 +-Dir: +##---------------------------------------- Added: trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/repo/susetags/data… ============================================================================== --- trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en (added) +++ trunk/libzypp/tests/repo/susetags/data/shared_attributes/suse/setup/descr/packages.en Thu Sep 6 02:23:51 2007 @@ -0,0 +1,8 @@ +##---------------------------------------- +=Pkg: foo 1.0 1 i586 +=Sum: Foo program ++Des: + +This package contains foo +-Des: +##---------------------------------------- -- 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] r7114 - /trunk/libzypp/package/libzypp.changes
by schubi2＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: schubi2 Date: Wed Sep 5 17:53:10 2007 New Revision: 7114 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7114&view=rev Log: r 7113 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 Wed Sep 5 17:53:10 2007 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Sep 5 17:52:37 CEST 2007 - schubi(a)suse.de + +- logging "reverse" NEEDED_BY in the detail description of solver + problems. +- improved error message if a requiremnt is not fulfilled Bug 307743 +- Add "ignore" option to the solution if a requirement is not fulfilled + Bug 304276 +- revision 7113 + +------------------------------------------------------------------- Wed Sep 5 14:33:02 CEST 2007 - jkupec(a)suse.cz - fixed the order of operands of susetags local metadata status -- 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] r7113 - in /trunk/libzypp/zypp/solver/detail: QueueItemRequire.cc Resolver.cc Resolver.h Resolver_problems.cc SolutionAction.cc
by schubi2＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: schubi2 Date: Wed Sep 5 17:52:16 2007 New Revision: 7113 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7113&view=rev Log: - logging "reverse" NEEDED_BY in the detail description of solver problems. - improved error message if a requiremnt is not fulfilled Bug 307743 - Add "ignore" option to the solution if a requirement is not fulfilled Bug 304276 Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc trunk/libzypp/zypp/solver/detail/Resolver.cc trunk/libzypp/zypp/solver/detail/Resolver.h trunk/libzypp/zypp/solver/detail/Resolver_problems.cc trunk/libzypp/zypp/solver/detail/SolutionAction.cc Modified: trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Queue… ============================================================================== --- trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc (original) +++ trunk/libzypp/zypp/solver/detail/QueueItemRequire.cc Wed Sep 5 17:52:16 2007 @@ -615,7 +615,6 @@ } // now check if a provider supplements or enhances an installed or to-be-installed resolvable - if (hint_match( item->dep( Dep::SUPPLEMENTS ), pool() ) || hint_match( item->dep( Dep::ENHANCES ), pool() )) { Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.cc Wed Sep 5 17:52:16 2007 @@ -422,6 +422,13 @@ _extra_caps.insert (capability); } +void +Resolver::removeExtraCapability (const Capability & capability) +{ + _extra_caps.erase (capability); +} + + void Resolver::addExtraConflict (const Capability & capability) Modified: trunk/libzypp/zypp/solver/detail/Resolver.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver.h (original) +++ trunk/libzypp/zypp/solver/detail/Resolver.h Wed Sep 5 17:52:16 2007 @@ -225,6 +225,7 @@ void addPoolItemToVerify (PoolItem_Ref item); void addExtraCapability (const Capability & capability); + void removeExtraCapability (const Capability & capability); void addExtraConflict (const Capability & capability); const CapSet extraCapability () { return _extra_caps; } Modified: trunk/libzypp/zypp/solver/detail/Resolver_problems.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resol… ============================================================================== --- trunk/libzypp/zypp/solver/detail/Resolver_problems.cc (original) +++ trunk/libzypp/zypp/solver/detail/Resolver_problems.cc Wed Sep 5 17:52:16 2007 @@ -136,6 +136,16 @@ collector->problems.insert (make_pair( item, info)); } else { collector->additionalInfo.insert (make_pair( item, info)); + + if (info->type()==RESOLVER_INFO_TYPE_NEEDED_BY) { // logging reverse needed by + ResolverInfoNeededBy_constPtr needed_by = dynamic_pointer_cast<const ResolverInfoNeededBy>(info); + PoolItemList itemList = needed_by->items(); + for (PoolItemList::const_iterator iter = itemList.begin(); + iter != itemList.end(); ++iter) + { + collector->additionalInfo.insert (make_pair( *iter, info)); + } + } } // Collicting items which are providing requirements but they @@ -699,8 +709,13 @@ break; case RESOLVER_INFO_TYPE_NO_PROVIDER: { // There are no installable providers of c [for p] ResolverInfoMisc_constPtr misc_info = dynamic_pointer_cast<const ResolverInfoMisc>(info); - // TranslatorExplanation %s = name of package, patch, selection ... - what = str::form (_("%s cannot be installed due to missing dependencies"), whoShort.c_str()); + if (item.status().isInstalled()) { + // TranslatorExplanation %s = name of package, patch, selection ... + what = str::form (_("%s has missing dependencies"), whoShort.c_str()); + } else { + // TranslatorExplanation %s = name of package, patch, selection ... + what = str::form (_("%s cannot be installed due to missing dependencies"), whoShort.c_str()); + } details = misc_info->message() + "\n"; details += logAdditionalInfo(collector.additionalInfo, item); ResolverProblem_Ptr problem = new ResolverProblem (what, details); @@ -947,6 +962,8 @@ details += more_details; } ResolverProblem_Ptr problem = new ResolverProblem (what, details); + // ignore requirement + problem->addSolution (new ProblemSolutionIgnoreRequires (problem, PoolItem_Ref(), misc_info->capability())); problems.push_back (problem); problem_created = true; } Modified: trunk/libzypp/zypp/solver/detail/SolutionAction.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Solut… ============================================================================== --- trunk/libzypp/zypp/solver/detail/SolutionAction.cc (original) +++ trunk/libzypp/zypp/solver/detail/SolutionAction.cc Wed Sep 5 17:52:16 2007 @@ -181,8 +181,12 @@ bool InjectSolutionAction::execute(Resolver & resolver) const { - Dependencies dependencies = _item.resolvable()->deps(); - CapSet depList = dependencies[Dep::CONFLICTS]; + Dependencies dependencies; + CapSet depList; + if (_item != PoolItem_Ref()) { + dependencies = _item.resolvable()->deps(); + depList = dependencies[Dep::CONFLICTS]; + } switch (_kind) { case CONFLICTS: // removing conflict in both resolvables @@ -221,7 +225,13 @@ break; case REQUIRES: // removing the requires dependency from the item - resolver.addIgnoreRequires (_item, _capability); + if (_item == PoolItem_Ref()) { + // this was a requirement via Resolver::addExtraCapability + // so we have to delete it. + resolver.removeExtraCapability (_capability); + } else { + resolver.addIgnoreRequires (_item, _capability); + } break; case ARCHITECTURE: // This item is for ALL architectures available -- 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] r7112 - in /trunk/libzypp-testsuite/solver/data.deptestomatic: basic-exercises/ yast-tests/
by schubi2＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: schubi2 Date: Wed Sep 5 17:48:32 2007 New Revision: 7112 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7112&view=rev Log: Testcases for bug 304276 and 307734 added or changed Added: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/Bug299486-test.solution Wed Sep 5 17:48:32 2007 @@ -2,3 +2,6 @@ >!> Problem: >!> Requirememt asdfasdf cannot be fulfilled. >!> There are no installable providers of asdfasdf +>!> Solution: +>!> Ignore this requirement just here +>!> Added: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.solution Wed Sep 5 17:48:32 2007 @@ -0,0 +1,29 @@ +>!> 2 problems found: +>!> Problem: +>!> No valid solution found with just resolvables of best architecture. +>!> With this run only resolvables with the best architecture have been regarded. +>!> Solution: +>!> Make a solver run with ALL possibilities. +>!> Regarding all resolvables with a compatible architecture. +>!> Problem: +>!> Requirememt notavailable cannot be fulfilled. +>!> There are no installable providers of notavailable +>!> Solution: +>!> Ignore this requirement just here +>!> +>!> Taking solution: 0 +>!> For problem: 1 +>!> No problems so far +>!> No problems so far +>!> Solution #1: +>!> install A-2.0-1.noarch[test] +>!> install B-1.0-1.noarch[test] +>!> install D-1.0-1.noarch[test] +>!> |unflag E-1.0-1.noarch[test] +>!> installs=3, upgrades=0, uninstalls=0 +>!> Solution #2: +>!> install A-2.0-1.noarch[test] +>!> install B-1.0-1.noarch[test] +>!> install C-1.0-1.noarch[test] +>!> |unflag E-1.0-1.noarch[test] +>!> installs=3, upgrades=0, uninstalls=0 Added: trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/basic-exercises/require-3-test.xml Wed Sep 5 17:48:32 2007 @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<test allow_virtual_conflicts="yes"> +<setup> + <system file="exercise-1-system.xml.gz"/> + <channel name="test" file="require-packages.xml.gz"/> +</setup> +<trial> + <addRequire kind="package" name="notavailable"/> + <addRequire kind="package" name="A"/> + <reportproblems/> + <takesolution problem="1" solution="0"/> + <reportproblems/> +</trial> +</test> Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution1 Wed Sep 5 17:48:32 2007 @@ -4050,7 +4050,7 @@ >!> Ignore this requirement just here >!> >!> Problem: ->!> subversion-perl cannot be installed due to missing dependencies +>!> subversion-perl has missing dependencies >!> There are no installable providers of libaprutil-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion-perl Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution2 Wed Sep 5 17:48:32 2007 @@ -4050,7 +4050,7 @@ >!> Ignore this requirement just here >!> >!> Problem: ->!> subversion-perl cannot be installed due to missing dependencies +>!> subversion-perl has missing dependencies >!> There are no installable providers of libapr-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion-perl Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.de… ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/yast-tests/Bug156439-test.solution3 Wed Sep 5 17:48:32 2007 @@ -4050,7 +4050,7 @@ >!> Ignore this requirement just here >!> >!> Problem: ->!> subversion-perl cannot be installed due to missing dependencies +>!> subversion-perl has missing dependencies >!> There are no installable providers of libaprutil-0.so.0 for subversion-perl-1.3.0_rc1-0.1.i586 >!> Solution: >!> delete subversion-perl -- 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] r7111 - in /trunk/updater-kde/updater: MainWindow.cpp progresspopup.cpp simpleview.cpp zypp/ZYppUpdater.cpp
by tgoettlicher＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: tgoettlicher Date: Wed Sep 5 17:06:16 2007 New Revision: 7111 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7111&view=rev Log: backup Modified: trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/progresspopup.cpp trunk/updater-kde/updater/simpleview.cpp trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.c… ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Wed Sep 5 17:06:16 2007 @@ -355,26 +355,55 @@ // todo void MainWindow::slotAppletState(int state, int patches, int packages) { - // don't show updates tray icon when only optional updates are available - if (state == APPLET_UPDATES && patchCountRecommended(false) + patchCountSecurity(false) == 0) - applet->setState(APPLET_ONLY_OPTIONAL_UPDATES); - else - applet->setState(state); - applet->setUpdates(patches, packages); - if (_caps.canProvidePackages && UpdaterSettings::self()->showPackages()) - _simple->setTotalCount(patches + packages); - else - _simple->setTotalCount(patches); - _simple->setRecommendedCount(patchCountRecommended()); - _simple->setSecurityCount(patchCountSecurity()); - _simple->setRestartCount(patchCountRestart()); - _simple->setState(state); + if (state == APPLET_UPDATES || state == APPLET_CRITICAL_UPDATES ) + { + _simple->setRecommendedCount(patchCountRecommended()); + _simple->setSecurityCount(patchCountSecurity()); + _simple->setRestartCount(patchCountRestart()); + if (_caps.canProvidePackages && UpdaterSettings::self()->showPackages()) + { + _simple->setTotalCount(patches + packages); - _check_updates_action->setEnabled(true); - _edit_sources_action->setEnabled(true); + if ( patchCountRecommended(false) + patchCountSecurity(false) == 0) + { + applet->setState(APPLET_ONLY_OPTIONAL_UPDATES); + _simple->setState(APPLET_ONLY_OPTIONAL_UPDATES); + } + else + { + applet->setState(state); + _simple->setState(state); + } + } + else + { + _simple->setTotalCount(patches); + + if ( patchCountRecommended(false) + patchCountSecurity(false) == 0 && patches > 0) + { + applet->setState(APPLET_ONLY_OPTIONAL_UPDATES); + _simple->setState(APPLET_ONLY_OPTIONAL_UPDATES); + } + else if (patches > 0) + { + applet->setState(state); + _simple->setState(state); + } + else + { + applet->setState(APPLET_NO_UPDATES); + _simple->setState(APPLET_NO_UPDATES); + } + } + } + else + { + _simple->setState(state); + applet->setState(state); + } if ( state == APPLET_CHECKING || state == APPLET_INSTALLING || state == APPLET_NO_NETWORK ) _check_updates_action->setEnabled(false); @@ -382,6 +411,11 @@ _check_updates_action->setEnabled(true); + + _check_updates_action->setEnabled(true); + _edit_sources_action->setEnabled(true); + + } void MainWindow::slotSetProgress(int step, int totalSteps, QString text) Modified: trunk/updater-kde/updater/progresspopup.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/progresspopu… ============================================================================== --- trunk/updater-kde/updater/progresspopup.cpp (original) +++ trunk/updater-kde/updater/progresspopup.cpp Wed Sep 5 17:06:16 2007 @@ -42,6 +42,7 @@ void ProgressPopup::setText(QString text) { packageLabel->setText(text); + positionSelf(); } void ProgressPopup::setTotalSteps(int steps) Modified: trunk/updater-kde/updater/simpleview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/simpleview.c… ============================================================================== --- trunk/updater-kde/updater/simpleview.cpp (original) +++ trunk/updater-kde/updater/simpleview.cpp Wed Sep 5 17:06:16 2007 @@ -229,6 +229,7 @@ bar->hide(); break; + case APPLET_ONLY_OPTIONAL_UPDATES: case APPLET_UPDATES: case APPLET_CRITICAL_UPDATES: headline->setText(i18n("New software for your system is available")); @@ -273,7 +274,6 @@ else norestart->hide(); - if(securityCount == 0 && recommendedCount == 0 ) { install->setEnabled(false); @@ -340,6 +340,7 @@ void SimpleView::setSecurityCount(int count) { + kdDebug() << count << " == sec" << endl; securityCount=count; } Modified: trunk/updater-kde/updater/zypp/ZYppUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/zypp/ZYppUpd… ============================================================================== --- trunk/updater-kde/updater/zypp/ZYppUpdater.cpp (original) +++ trunk/updater-kde/updater/zypp/ZYppUpdater.cpp Wed Sep 5 17:06:16 2007 @@ -263,7 +263,7 @@ emit(updateApplet(APPLET_PKGMGR_UPDATES, _patchList->childCount(), _packageList->childCount())); else if (critical_available) emit(updateApplet(APPLET_CRITICAL_UPDATES, _patchList->childCount(), _packageList->childCount())); - else if ( _patchList->childCount() > 0 ) + else if ( _patchList->childCount() + _packageList->childCount() > 0 ) emit(updateApplet(APPLET_UPDATES, _patchList->childCount(), _packageList->childCount())); else emit(updateApplet(APPLET_NO_UPDATES, 0, 0)); -- 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] r7110 - in /trunk/libzypp: libzypp.spec.cmake package/libzypp.changes
by jkupec＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: jkupec Date: Wed Sep 5 14:56:18 2007 New Revision: 7110 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7110&view=rev Log: - correct compiler flags Modified: trunk/libzypp/libzypp.spec.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/libzypp.spec.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/libzypp.spec.cmake?rev=7… ============================================================================== --- trunk/libzypp/libzypp.spec.cmake (original) +++ trunk/libzypp/libzypp.spec.cmake Wed Sep 5 14:56:18 2007 @@ -1,7 +1,7 @@ # # spec file for package libzypp # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -License: GPL +License: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on @@ -75,12 +75,12 @@ cd build cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ - -DCMAKE_C_FLAGS="%{optflags}" \ - -DCMAKE_CXX_FLAGS="%{optflags}" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ .. -make %{?jobs:-j %jobs} +make %{?jobs:-j %jobs} VERBOSE=1 make -C doc/autodoc %{?jobs:-j %jobs} make -C po %{?jobs:-j %jobs} translations 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 Wed Sep 5 14:56:18 2007 @@ -14,6 +14,11 @@ - revision 7103 ------------------------------------------------------------------- +Mon Sep 3 18:43:51 CEST 2007 - schwab(a)suse.de + +- Use $RPM_OPT_FLAGS. + +------------------------------------------------------------------- Mon Sep 3 17:14:02 CEST 2007 - ma(a)suse.de - Reset transact bits when switching status from -- 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] r7109 - in /trunk/libzypp: VERSION.cmake package/libzypp.changes
by jkupec＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: jkupec Date: Wed Sep 5 14:47:12 2007 New Revision: 7109 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7109&view=rev Log: version Modified: trunk/libzypp/VERSION.cmake trunk/libzypp/package/libzypp.changes Modified: trunk/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/VERSION.cmake?rev=7109&r… ============================================================================== --- trunk/libzypp/VERSION.cmake (original) +++ trunk/libzypp/VERSION.cmake Wed Sep 5 14:47:12 2007 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "22") SET(LIBZYPP_COMPATMINOR "21") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") 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 Wed Sep 5 14:47:12 2007 @@ -5,6 +5,7 @@ computation which caused the YaST repositories to always get refreshed (part of bug #304310) - revision 7107 +- version 3.22.2 ------------------------------------------------------------------- Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de -- 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] r7108 - in /trunk/libzypp: package/libzypp.changes zypp/RepoManager.cc
by jkupec＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: jkupec Date: Wed Sep 5 14:38:27 2007 New Revision: 7108 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7108&view=rev Log: changes Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/RepoManager.cc 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 Wed Sep 5 14:38:27 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Sep 5 14:33:02 CEST 2007 - jkupec(a)suse.cz + +- fixed the order of operands of susetags local metadata status + computation which caused the YaST repositories to always get + refreshed (part of bug #304310) +- revision 7107 + +------------------------------------------------------------------- Tue Sep 4 12:09:10 CEST 2007 - schubi(a)suse.de - comparing vendor with VendorAttr::equivalent 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 Wed Sep 5 14:38:27 2007 @@ -327,6 +327,7 @@ case RepoType::YAST2_e : { + // the order of RepoStatus && RepoStatus matters! (#304310) status = RepoStatus( rawpath + "/content") && (RepoStatus( rawpath + "/media.1/media")); } break; -- 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] r7107 - /trunk/libzypp/zypp/RepoManager.cc
by jkupec＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: jkupec Date: Wed Sep 5 14:32:41 2007 New Revision: 7107 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7107&view=rev Log: - fixed the order of operands of susetags local metadata status computation (part of bug #304310) Modified: trunk/libzypp/zypp/RepoManager.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 Wed Sep 5 14:32:41 2007 @@ -327,7 +327,7 @@ case RepoType::YAST2_e : { - status = (RepoStatus( rawpath + "/media.1/media") && RepoStatus( rawpath + "/content") ); + status = RepoStatus( rawpath + "/content") && (RepoStatus( rawpath + "/media.1/media")); } break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0