Author: mlandres
Date: Thu May 8 23:48:54 2008
New Revision: 9998
URL: http://svn.opensuse.org/viewcvs/zypp?rev=9998&view=rev
Log:
backup
Modified:
trunk/libzypp/devel/devel.ma/NewPool.cc
Modified: trunk/libzypp/devel/devel.ma/NewPool.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/devel/devel.ma/NewPool.cc?rev=9998&r1=9997&r2=9998&view=diff
==============================================================================
--- trunk/libzypp/devel/devel.ma/NewPool.cc (original)
+++ trunk/libzypp/devel/devel.ma/NewPool.cc Thu May 8 23:48:54 2008
@@ -9,6 +9,7 @@
#include
#include
#include
+#include
#include
#include
@@ -44,6 +45,7 @@
#include "zypp/PoolQuery.h"
#include
+#include
#include
@@ -456,71 +458,73 @@
namespace zypp
{
-}
-
-void tt( const std::string & name_r, ResKind kind_r = ResKind::package )
-{
- Capability cap( name_r, kind_r );
- sat::WhatProvides possibleProviders(cap);
- (possibleProviders.empty()?WAR:MIL) << name_r << endl;
- for_(iter, possibleProviders.begin(), possibleProviders.end())
+ struct ProductConfData
{
- MIL << name_r << endl;
- PoolItem provider = ResPool::instance().find(*iter);
- }
-}
+ IdString _name;
+ Edition _edition;
+ Arch _arch;
-void sslk( const std::string & t = std::string() )
-{
- ResPool pool( ResPool::instance() );
- ostream & outs( SEC );
- unsigned cnt = 0;
- outs << t << ": {" << endl;
- for_( it, pool.begin(), pool.end() )
+ IdString _distName;
+ Edition _distEdition;
+ };
+
+ class ProductConfReader
{
- if ( it->status().isLocked() )
- {
- outs << " " << *it << endl;
- ++cnt;
- }
- }
- outs << '}' << cnt << endl;
-}
+ public:
+ typedef function Consumer;
-void ssup()
-{
- ResPool pool( ResPool::instance() );
+ public:
+ ProductConfReader()
+ {}
- ResPool::HardLockQueries newLocks;
+ ProductConfReader( const Consumer & consumer_r )
+ : _consumer( consumer_r )
+ {}
+ ProductConfReader( const Consumer & consumer_r, const InputStream & input_r )
+ : _consumer( consumer_r )
+ { parse( input_r ); }
+
+ public:
+ const Consumer & consumer() const
+ { return _consumer; }
+
+ void setConsumer( const Consumer & consumer_r )
+ { _consumer = consumer_r; }
+
+ public:
+ void parse( const InputStream & input = InputStream() ) const;
+
+ private:
+ Consumer _consumer;
+ };
+
+ void ProductConfReader::parse( const InputStream & input_r ) const
{
- PoolQuery q;
- q.addAttribute( sat::SolvAttr::name, "kde3*" );
- q.setMatchGlob();
- dumpRange( DBG, q.begin(), q.end() ) << endl;
- newLocks.push_back( q );
- }
- {
- PoolQuery q;
- q.addAttribute( sat::SolvAttr::name, "kde4*" );
- q.setMatchGlob();
- dumpRange( DBG, q.begin(), q.end() ) << endl;
- newLocks.push_back( q );
- }
- {
- PoolQuery q;
- q.addAttribute( sat::SolvAttr::name, "amarok" );
- q.addKind( ResKind::package );
- q.setMatchExact();
- q.setCaseSensitive(true);
- dumpRange( DBG, q.begin(), q.end() ) << endl;
- newLocks.push_back( q );
- }
+ WAR << "+++" << input_r << endl;
+ parser::IniDict dict( input_r );
- pool.setHardLockQueries( newLocks );
+ for_( sit, dict.sectionsBegin(), dict.sectionsEnd() )
+ {
+ string section(*sit);
+ MIL << section << endl;
+ for_( it, dict.entriesBegin(*sit), dict.entriesEnd(*sit) )
+ {
+ string entry( it->first );
+ string value( it->second );
+ DBG << (*it).first << "=" << (*it).second << endl;
+ }
+ }
+ WAR << "---" << input_r << endl;
+ }
}
+bool PCDC( const ProductConfData & d )
+{
+ SEC << endl;
+ return true;
+}
/******************************************************************
**
@@ -535,6 +539,13 @@
INT << "===[START]==========================================" << endl;
ZConfig::instance();
+ ProductConfReader r( &PCDC, "test.prod" );
+
+ ///////////////////////////////////////////////////////////////////
+ INT << "===[END]============================================" << endl << endl;
+ zypp::base::LogControl::instance().logNothing();
+ return 0;
+
ResPool pool( ResPool::instance() );
sat::Pool satpool( sat::Pool::instance() );
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
