July 2007 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r6334 - in /trunk/libzypp/devel/devel.ma: Basic.cc CMakeLists.txt Parse.cc
by mlandres＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mlandres Date: Tue Jul 31 16:28:11 2007 New Revision: 6334 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6334&view=rev Log: backup Modified: trunk/libzypp/devel/devel.ma/Basic.cc trunk/libzypp/devel/devel.ma/CMakeLists.txt trunk/libzypp/devel/devel.ma/Parse.cc Modified: trunk/libzypp/devel/devel.ma/Basic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Basic.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Basic.cc (original) +++ trunk/libzypp/devel/devel.ma/Basic.cc Tue Jul 31 16:28:11 2007 @@ -1,4 +1,5 @@ #include "Tools.h" +#include "Tools.h" #include <iostream> @@ -9,26 +10,11 @@ using namespace std; using namespace zypp; -struct BuildRes +void chk( ResObject::constPtr p ) { - BuildRes() - { - } - - void operator()( const char *const & line_r ) const - { operator()( string( line_r ) ); } - - void operator()( const string & line_r ) const - { - vector<string> words; - switch ( str::split( line_r, back_inserter(words) ) ) - { - default: - DBG << words << endl; - } - } - -}; + MIL << p << endl; + DBG << p->deps() << endl; +} /****************************************************************** @@ -40,17 +26,24 @@ { INT << "===[START]==========================================" << endl; - //ResPool pool( getZYpp()->pool() ); + ResPool pool( getZYpp()->pool() ); const char *const lines[] = { - "I Product prod 1 1 x86_64" - "A Product prod2 1 1 x86_64" + "@ package", + "@ installed", + "- foo 1 1 i686", + "@ provides", + "modalias(kernel-bigsmp:pci:*provided*)", + "@ suplements", + "modalias(kernel-bigsmp:pci:*suplements*)", + "@ fin" }; - BuildRes a; + //debug::addPool( lines, lines+(sizeof(lines)/sizeof(const char *const)) ); + debug::addPool( "/tmp/a" ); + USR << pool << endl; - for_each( lines, lines+(sizeof(lines)/sizeof(const char *const)), - a ); + for_each( pool.begin(), pool.end(), chk ); INT << "===[END]============================================" << endl << endl; Modified: trunk/libzypp/devel/devel.ma/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/CMakeList… ============================================================================== --- trunk/libzypp/devel/devel.ma/CMakeLists.txt (original) +++ trunk/libzypp/devel/devel.ma/CMakeLists.txt Tue Jul 31 16:28:11 2007 @@ -39,7 +39,7 @@ ENDFOREACH( loop_var ) -FOREACH( loop_var AOUT Parse Test) +FOREACH( loop_var AOUT Parse Test Basic) ADD_EXECUTABLE( ${loop_var} ${loop_var}.cc ) Modified: trunk/libzypp/devel/devel.ma/Parse.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/Parse.cc?… ============================================================================== --- trunk/libzypp/devel/devel.ma/Parse.cc (original) +++ trunk/libzypp/devel/devel.ma/Parse.cc Tue Jul 31 16:28:11 2007 @@ -264,6 +264,25 @@ //zypp::base::LogControl::instance().logfile( "log.restrict" ); INT << "===[START]==========================================" << endl; + Capability c( CapFactory().parse( ResTraits<Package>::kind, + "modalias(kernel-bigsmp:pci:kfghkskd***k)" ) ); + + capability::ModaliasCap::constPtr mc( capability::asKind<capability::ModaliasCap>(c) ); + + DBG << c << endl; + DBG << c.index() << endl; + + MIL << mc << endl; + MIL << mc->name() << endl; + MIL << mc->pkgname() << endl; + + + + /////////////////////////////////////////////////////////////////// + INT << "===[END]============================================" << endl << endl; + zypp::base::LogControl::instance().logNothing(); + return 0; + RepoManager repoManager( makeRepoManager( "/Local/ROOT" ) ); RepoInfoList repos = repoManager.knownRepositories(); SEC << repos << endl; -- 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] r6333 - /trunk/libzypp/zypp/detail/ResolvableImpl.cc
by mlandres＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: mlandres Date: Tue Jul 31 16:27:58 2007 New Revision: 6333 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6333&view=rev Log: use typedef Modified: trunk/libzypp/zypp/detail/ResolvableImpl.cc Modified: trunk/libzypp/zypp/detail/ResolvableImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/detail/ResolvableIm… ============================================================================== --- trunk/libzypp/zypp/detail/ResolvableImpl.cc (original) +++ trunk/libzypp/zypp/detail/ResolvableImpl.cc Tue Jul 31 16:27:58 2007 @@ -67,7 +67,7 @@ // in case cap provides a packagename, inject a SUPPLEMENTS. // if modalias does not provide a packagename, default to "kernel" (#184840) - intrusive_ptr<const capability::ModaliasCap> cap( capability::asKind<capability::ModaliasCap>(cap_r) ); + capability::ModaliasCap::constPtr cap( capability::asKind<capability::ModaliasCap>(cap_r) ); if ( cap ) { std::string pkgname( cap->pkgname() ); if ( pkgname.empty() ) { @@ -92,14 +92,14 @@ // Required kmp packges FOR EACH installed/to_be_installed kernel will be installed. // Bug 255011 if (capString[capString.size()-1] == ')') { // trailing ")" given ? - CapFactory f; + CapFactory f; std::string andDep( capString, 11 ); // strip "packageand(" std::string::size_type pos = andDep.find( ":" ); // colon given ? if (pos != std::string::npos) { deps[Dep::SUPPLEMENTS].insert( f.parse( ResTraits<Package>::kind, std::string( andDep, 0, pos ) ) ); pos++; // skip ":" std::string depString( andDep, pos, andDep.size()-pos-1 ); - deps[Dep::FRESHENS].insert( f.parse( ResTraits<Package>::kind, depString ) ); + deps[Dep::FRESHENS].insert( f.parse( ResTraits<Package>::kind, depString ) ); } else { ERR << "wrong dependency (missing \":\") : " << capString <<endl; } -- 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] r6332 - /trunk/libzypp-bindings/examples/ruby/parse1.rb
by aschnell＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: aschnell Date: Tue Jul 31 15:55:00 2007 New Revision: 6332 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6332&view=rev Log: - finished example Modified: trunk/libzypp-bindings/examples/ruby/parse1.rb Modified: trunk/libzypp-bindings/examples/ruby/parse1.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/examples/ruby/p… ============================================================================== --- trunk/libzypp-bindings/examples/ruby/parse1.rb (original) +++ trunk/libzypp-bindings/examples/ruby/parse1.rb Tue Jul 31 15:55:00 2007 @@ -37,11 +37,27 @@ z.add_resolvables(store) end -puts pool.class +# puts pool.class pool.each do | p | - puts p.class - # TODO - # puts "#{p.name}" + + # puts p.class + r = p.resolvable + # puts r.class + puts "#{r.kind_to_s} #{r.name} #{r.edition.to_s} #{r.arch.to_s}" + puts " Summary: #{r.summary}" + puts " Size: #{r.size}" + puts " Vendor: #{r.vendor}" + puts " Buildtime: #{r.buildtime}" + + d = r.dep(Dep.PROVIDES) + # puts d.class + d.each do | x | + # puts y.class + puts " Provides: #{x.to_s}" + end + + puts + end -- 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] r6331 - /trunk/libzypp-bindings/swig/ResObject.i
by aschnell＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: aschnell Date: Tue Jul 31 15:47:33 2007 New Revision: 6331 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6331&view=rev Log: - added kind_to_s workaround for another kind Modified: trunk/libzypp-bindings/swig/ResObject.i Modified: trunk/libzypp-bindings/swig/ResObject.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResObject.… ============================================================================== --- trunk/libzypp-bindings/swig/ResObject.i (original) +++ trunk/libzypp-bindings/swig/ResObject.i Tue Jul 31 15:47:33 2007 @@ -30,3 +30,21 @@ virtual ~ResObject(); }; +// FIXME: this is just a workaround, see Kind.i +%extend intrusive_ptr<const ResObject> { + const char* kindToS() + { + if (isKind<Package>(*self)) + return "package"; + else if (isKind<Patch>(*self)) + return "patch"; + else if (isKind<Product>(*self)) + return "product"; + else if (isKind<Pattern>(*self)) + return "pattern"; + else if (isKind<Language>(*self)) + return "language"; + return "unknown"; + } +} + -- 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] r6330 - in /trunk/libzypp-bindings/swig: PoolItem.i ResObject.i
by aschnell＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: aschnell Date: Tue Jul 31 15:22:12 2007 New Revision: 6330 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6330&view=rev Log: - wrap template for ResObject Modified: trunk/libzypp-bindings/swig/PoolItem.i trunk/libzypp-bindings/swig/ResObject.i Modified: trunk/libzypp-bindings/swig/PoolItem.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/PoolItem.i… ============================================================================== --- trunk/libzypp-bindings/swig/PoolItem.i (original) +++ trunk/libzypp-bindings/swig/PoolItem.i Tue Jul 31 15:22:12 2007 @@ -30,7 +30,8 @@ /** Returns the ResObject::constPtr. * \see \ref operator-> */ - ResObject::constPtr resolvable() const; + // ResObject::constPtr resolvable() const; + intrusive_ptr<const ResObject> resolvable() const; public: Modified: trunk/libzypp-bindings/swig/ResObject.i URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-bindings/swig/ResObject.… ============================================================================== --- trunk/libzypp-bindings/swig/ResObject.i (original) +++ trunk/libzypp-bindings/swig/ResObject.i Tue Jul 31 15:22:12 2007 @@ -1,5 +1,5 @@ -// %template(ResObject_Ptr) intrusive_ptr<ResObject>; +%template(ResObject_constPtr) intrusive_ptr<const ResObject>; class ResObject : public Resolvable { @@ -28,5 +28,5 @@ ResObject( const Kind & kind_r, const NVRAD & nvrad_r ); virtual ~ResObject(); - virtual std::ostream & dumpOn( std::ostream & str ) const; }; + -- 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] r6329 - in /trunk/zypper/src: zypper.cc zypper.h
by jkupec＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jkupec Date: Tue Jul 31 14:34:26 2007 New Revision: 6329 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6329&view=rev Log: indent Modified: trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6329&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Jul 31 14:34:26 2007 @@ -585,8 +585,8 @@ "'xml-updates' - Show updates and patches in xml format\n" "\n" "This command has no additional options.\n" - ); - } + ); + } parsed_opts copts = parse_options (argc, argv, specific_options); if (copts.count("_unknown")) Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=6329&r1=… ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Tue Jul 31 14:34:26 2007 @@ -51,7 +51,7 @@ non_interactive(false), no_gpg_checks(false), license_auto_agree(false), - machine_readable(false), + machine_readable(false), root_dir("/") {} @@ -77,7 +77,7 @@ bool non_interactive; bool no_gpg_checks; bool license_auto_agree; - bool machine_readable; + bool machine_readable; std::string root_dir; }; -- 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] r6328 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jkupec Date: Tue Jul 31 13:43:23 2007 New Revision: 6328 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6328&view=rev Log: .changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue Jul 31 13:43:23 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 31 13:42:25 CEST 2007 - jkupec(a)suse.cz + +- fixed typo in the help (#295980) +- r6327 + +------------------------------------------------------------------- Tue Jul 31 11:15:46 CEST 2007 - schubi(a)suse.de - Removed keepExtra parameter in resolvePool; Bug 294727 -- 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] r6327 - in /trunk/zypper: doc/zypper.8 src/zypper.cc
by jkupec＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: jkupec Date: Tue Jul 31 13:42:17 2007 New Revision: 6327 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6327&view=rev Log: - fixed typo in the help (#295980) Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper.cc Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=6327&r1=… ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Tue Jul 31 13:42:17 2007 @@ -211,7 +211,7 @@ Read URI and alias from specified .repo file .TP \fI\-t, \-\-type\fR <TYPE> -Type of repository (YaST, YUM, or Plaindir). +Type of repository (YaST, YUM, or plaindir). .TP \fI\-d, \-\-disabled\fR Add the repository as disabled. Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=6327&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Tue Jul 31 13:42:17 2007 @@ -331,7 +331,7 @@ " Command options:\n" "\t--repo,-r <FILE.repo>\tRead the URL and alias from a file\n" "\t\t\t\t(even remote)\n" - "\t--type,-t <TYPE>\tType of repository (YaST, YUM, or Plaindir)\n" + "\t--type,-t <TYPE>\tType of repository (YaST, YUM, or plaindir)\n" "\t--disabled,-d\t\tAdd the repository as disabled\n" "\t--no-refresh,-n\t\tAdd the repository with auto-refresh disabled\n" ); -- 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] r6326 - /trunk/libzypp-testsuite/solver/src/deptestomatic.cc
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 13:05:04 2007 New Revision: 6326 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6326&view=rev Log: revert resolvePool Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/dep… ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Tue Jul 31 13:05:04 2007 @@ -102,8 +102,6 @@ static int maxSolverPasses = 0; static int sys_res_install = 0; -static bool keepExtras = false; - typedef list<unsigned int> ChecksumList; typedef set<PoolItem_Ref> PoolItemSet; @@ -1536,7 +1534,6 @@ resolver->addExtraConflict(CapFactory().parse (string2kind (node->getProp ("kind")), names[i])); } - keepExtras = true; } else if (node->equals ("addRequire")) { vector<string> names; str::split( node->getProp ("name"), back_inserter(names), "," ); @@ -1544,9 +1541,8 @@ resolver->addExtraCapability(CapFactory().parse (string2kind (node->getProp ("kind")), names[i])); } - keepExtras = true; } else if (node->equals ("reportproblems")) { - if (resolver->resolvePool(false, keepExtras) == true + if (resolver->resolvePool() == true && node->getProp ("ignoreValidSolution").empty()) { RESULT << "No problems so far" << endl; } @@ -1614,7 +1610,7 @@ RESULT << "Wrong solution number (0-" << solutionCounter << ")" <<endl; } else { // resolve and check it again - if (resolver->resolvePool(false, keepExtras) == true) { + if (resolver->resolvePool() == true) { RESULT << "No problems so far" << endl; } else { @@ -1763,12 +1759,12 @@ resolver->verifySystem (); #if 0 else if (distupgrade) - resolver->resolvePool(false, keepExtras); + resolver->resolvePool(); else resolver->resolveDependencies (established); #else else - resolver->resolvePool(false,keepExtras); + resolver->resolvePool(); #endif @@ -2048,7 +2044,7 @@ } } else if (node->equals ("reportproblems")) { - if (resolver->resolvePool(false, keepExtras) == true) { + if (resolver->resolvePool() == true) { RESULT << "No problems so far" << endl; } else { @@ -2115,7 +2111,7 @@ RESULT << "Wrong solution number (0-" << solutionCounter << ")" <<endl; } else { // resolve and check it again - if (resolver->resolvePool(false, keepExtras) == true) { + if (resolver->resolvePool() == true) { RESULT << "No problems so far" << endl; } else { -- 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] r6325 - /trunk/zypper/package/zypper.changes
by schubi2＠svn.opensuse.org 31 Jul '07

31 Jul '07

Author: schubi2 Date: Tue Jul 31 11:18:54 2007 New Revision: 6325 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6325&view=rev Log: typo Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Tue Jul 31 11:18:54 2007 @@ -2,7 +2,7 @@ Tue Jul 31 11:15:46 CEST 2007 - schubi(a)suse.de - Removed keepExtra parameter in resolvePool; Bug 294727 -- r6232 +- r6323 ------------------------------------------------------------------- Tue Jul 31 11:04:35 CEST 2007 - jkupec(a)suse.cz -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0