May 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> master : - add sat_sort() function
by Michael Schroeder 12 May '09

12 May '09

ref: refs/heads/master commit 0457626762d9863feab073b0d37d7c1e57b79af8 Author: Michael Schroeder <mls(a)suse.de> Date: Tue May 12 12:18:55 2009 +0200 - add sat_sort() function --- src/util.c | 9 +++++++++ src/util.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/util.c b/src/util.c index 915dd1b..d534ba9 100644 --- a/src/util.c +++ b/src/util.c @@ -5,6 +5,8 @@ * for further information */ +#define _GNU_SOURCE + #include <stdio.h> #include <stdlib.h> #include <unistd.h> @@ -96,3 +98,10 @@ sat_timems(unsigned int subtract) return r - subtract; } +/* bsd's qsort_r has different arguments, so we define our + own version in case we need to do some clever mapping */ +void +sat_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard) +{ + qsort_r(base, nmemb, size, compar, compard); +} diff --git a/src/util.h b/src/util.h index 7662b62..e578faf 100644 --- a/src/util.h +++ b/src/util.h @@ -28,6 +28,7 @@ extern void *sat_realloc2(void *, size_t, size_t); extern void *sat_free(void *); extern void sat_oom(size_t, size_t); extern unsigned int sat_timems(unsigned int subtract); +extern void sat_sort(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *compard); static inline void *sat_extend(void *buf, size_t len, size_t nmemb, size_t size, size_t block) { -- 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 : - fix packageand() in testcase generation
by Michael Schroeder 11 May '09

11 May '09

ref: refs/heads/master commit 0fd218815668db3588e6b34120aa89d73f89d7e3 Author: Michael Schroeder <mls(a)suse.de> Date: Mon May 11 12:40:06 2009 +0200 - fix packageand() in testcase generation --- zypp/solver/detail/Testcase.cc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc index 175fb94..e57c174 100644 --- a/zypp/solver/detail/Testcase.cc +++ b/zypp/solver/detail/Testcase.cc @@ -116,7 +116,7 @@ std::string helixXML( const Capability &cap ) && detail.rhs().detail().isNamed()) { // packageand dependency str << "<dep name='packageand(" - << IdString(detail.lhs().id()) << "," + << IdString(detail.lhs().id()) << ":" << IdString(detail.rhs().id()) << ")' />" << endl; } else { // modalias ? -- 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> SuSE-Code-11-Branch : changes 5.30.2
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/SuSE-Code-11-Branch commit 82a8d12b08ae8dc3203ef6bf8dfe6e6acf094d3e Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 16:48:03 2009 +0200 changes 5.30.2 --- VERSION.cmake | 4 ++-- package/libzypp.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index fe33e93..0b5ef01 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -51,8 +51,8 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "30") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # -# LAST RELEASED: 5.30.1 (23) +# LAST RELEASED: 5.30.2 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff --git a/package/libzypp.changes b/package/libzypp.changes index 59e7689..6f5c3ce 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri May 8 16:47:15 CEST 2009 - ma(a)suse.de + +- Allow service refresh to change a repositories url (bnc #502157) +- version 5.30.2 (23) + +------------------------------------------------------------------- Tue May 5 13:49:41 CEST 2009 - ma(a)suse.de - Detect and compile with rpm 4.7 (bnc #444211) -- 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> SuSE-Code-11-Branch : Allow service refresh to change a repositories url (bnc #502157)
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/SuSE-Code-11-Branch commit 6903ade874dd37b0b40f2addf69b47f4cb7a46ee Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 16:44:23 2009 +0200 Allow service refresh to change a repositories url (bnc #502157) --- zypp/RepoManager.cc | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc index f14291d..f926001 100644 --- a/zypp/RepoManager.cc +++ b/zypp/RepoManager.cc @@ -1884,6 +1884,7 @@ namespace zypp // ==> an exising repo to check bool oldRepoModified = false; + // changed enable? if ( beEnabled ) { if ( ! oldRepo->enabled() ) @@ -1901,8 +1902,13 @@ namespace zypp } } -#warning also check changed URL due to PATH/URL change in service, but ignore ?credentials param! -// ma@: task for modifyRepository? + // changed url? + // service repo can contain only one URL now, so no need to iterate. + if ( oldRepo->url() != it->url() ) + { + oldRepo->setBaseUrl( it->url() ); + oldRepoModified = true; + } // save if modified: if ( oldRepoModified ) -- 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 08 May '09

08 May '09

ref: refs/heads/master commit ece039c8c98fc352dcd6128a4d69c7200c1627b5 Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 16:44:33 2009 +0200 changes --- package/libzypp.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index a51b1f6..4ed0741 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 8 16:43:47 CEST 2009 - ma(a)suse.de + +- Allow service refresh to change a repositories url (bnc #502157) + +------------------------------------------------------------------- Tue May 5 13:39:08 CEST 2009 - ma(a)suse.de - Detect and compile with rpm 4.7 (bnc #444211) -- 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 : Allow service refresh to change a repositories url (bnc #502157)
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/master commit bb859f949f4fca255c1727f11696d0f2c8bb2bc6 Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 16:44:23 2009 +0200 Allow service refresh to change a repositories url (bnc #502157) --- zypp/RepoManager.cc | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/zypp/RepoManager.cc b/zypp/RepoManager.cc index 19b76ac..740f70f 100644 --- a/zypp/RepoManager.cc +++ b/zypp/RepoManager.cc @@ -1904,6 +1904,7 @@ namespace zypp // ==> an exising repo to check bool oldRepoModified = false; + // changed enable? if ( beEnabled ) { if ( ! oldRepo->enabled() ) @@ -1921,8 +1922,13 @@ namespace zypp } } -#warning also check changed URL due to PATH/URL change in service, but ignore ?credentials param! -// ma@: task for modifyRepository? + // changed url? + // service repo can contain only one URL now, so no need to iterate. + if ( oldRepo->url() != it->url() ) + { + oldRepo->setBaseUrl( it->url() ); + oldRepoModified = true; + } // save if modified: if ( oldRepoModified ) -- 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 : backup
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/master commit 1a7e558c10aa8fceadd3925799194e168d53f5ee Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 14:59:19 2009 +0200 backup --- devel/devel.ma/DumpSolv.cc | 309 +++++++++++++------------------------------- 1 files changed, 89 insertions(+), 220 deletions(-) diff --git a/devel/devel.ma/DumpSolv.cc b/devel/devel.ma/DumpSolv.cc index a5ba541..9d71bc3 100644 --- a/devel/devel.ma/DumpSolv.cc +++ b/devel/devel.ma/DumpSolv.cc @@ -1,202 +1,14 @@ #include "Tools.h" #include <zypp/ResObjects.h> -#include <zypp/ProgressData.h> #include <zypp/sat/WhatObsoletes.h> #include "zypp/pool/GetResolvablesToInsDel.h" -/////////////////////////////////////////////////////////////////// -#if 0 -#include "zypp/parser/xml/ParseDef.h" -#include "zypp/parser/xml/ParseDefConsume.h" -#include "zypp/parser/xml/Reader.h" -namespace zypp -{ - namespace xml - { - namespace parsedefassign - { - template <class _Type> struct Assigner; - - /** Common interface to all Assigner. */ - template <> - struct Assigner<void> - { - virtual ~Assigner() - {} - virtual void assign( const char * text_r ) - {} - }; - - /** Assigner assigns text to types constructible from \c char*. */ - template <class _Type> - struct Assigner : public Assigner<void> - { - Assigner(_Type & value_r ) - : _value( &value_r ) - {} - - virtual void assign( const char * text_r ) - { *_value = _Type( text_r ); } - - private: - _Type * _value; - }; - - /** \name Assigner specialisation for numeric and boolean values. - * \relates Assigner - */ - //@{ - template <> - inline void Assigner<short>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<int>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<long>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<long long>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<unsigned short>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<unsigned>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<unsigned long>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<unsigned long long>::assign( const char * text_r ) { str::strtonum( text_r, *_value ); } - template <> - inline void Assigner<bool>::assign( const char * text_r ) { str::strToBoolNodefault( text_r, *_value ); } - //@} - } - - struct ParseDefAssignConsumer : public ParseDefConsume - { - virtual void start( const Node & node_r ) - {} - - virtual void text( const Node & node_r ) - {} - }; - - struct ParseDefAssign - { - template <class _Type> - ParseDefAssign( _Type & value_r ) - {} - - operator const shared_ptr<ParseDefAssignConsumer> &() const - { return _ptr; } - - private: - shared_ptr<ParseDefAssignConsumer> _ptr; - }; - - } - - /** Parse \c input_r and store data in \c data_r. - * - * \c _Data must be defaultconstructible and assignable. - * - * \c _Data::RootNode must be a \ref xml::ParseDef constructible - * from \c _Data&. - * - * \throws ParseDefException on parse errors. - * - * To parse a xml file like this: - * \code - * <test><setup>value</setup></test> - * \endcode - * - * You need something like this: - * \code - * struct XmlData - * { - * std::string value; - - * public: - * // Convenience parsing to *this. - * void parse( const Pathname & path_r ) - * { rnParse( path_r, *this ); } - - * public: - * // Parser description - * struct RootNode : public xml::ParseDef, public xml::ParseDefConsume - * { - * RootNode( XmlData & data ) - * : ParseDef( "test", MANDTAORY ) - * { - * (*this) - * ("setup", MANDTAORY, xml::parseDefAssignText( data.value ) ) - * ; - * } - * }; - * }; - * - * XmlData xmlData; - * xmlData.parse( "/tmp/mytest.xml" ); - * \endcode - */ - template<class _Data> - inline void rnParse( const InputStream & input_r, _Data & data_r ) - { - typedef typename _Data::RootNode RootNode; - MIL << "+++ " << input_r << endl; - _Data pdata; - try - { - xml::Reader reader( input_r ); - RootNode rootNode( pdata ); - rootNode.take( reader ); - } - catch ( const Exception & err ) - { - // parse error - ERR << err << endl; - ERR << "--- " << input_r << endl; - ZYPP_RETHROW( err ); - } - MIL << "--- " << input_r << endl; - data_r = pdata; - } +static std::string appname( __FILE__ ); +static TestSetup test; - struct SolverTestXml - { - public: - struct Chanel - { - Chanel() : priority( RepoInfo::defaultPriority() ) {} - std::string file; - std::string alias; - unsigned priority; - }; - - Arch systemArch; - Locale systemLocale; - std::string systemFile; - std::list<Chanel> chanelList; - - public: - /** Convenience parsing to \c this, appending \c "solver-test.xml" to directories. */ - void parse( const Pathname & path_r ) - { rnParse( (PathInfo(path_r).isDir() ? path_r/"solver-test.xml" : path_r ), *this ); } - - public: - struct RootNode : public xml::ParseDef, public xml::ParseDefConsume - { - RootNode( SolverTestXml & data ) - : ParseDef( "test", MANDTAORY, xml::parseDefAssignText( data.systemFile ) ) - { - (*this) - ("setup", MANDTAORY, xml::parseDefAssign( data.systemArch ) ) - ; - } - }; - }; -} -#endif /////////////////////////////////////////////////////////////////// -static std::string appname( __FILE__ ); - #define OUT USR #define HEADL SEC << "===> " @@ -223,14 +35,6 @@ int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) /////////////////////////////////////////////////////////////////// -bool progressReceiver( const ProgressData & v ) -{ - DBG << "...->" << v << endl; - return true; -} - -/////////////////////////////////////////////////////////////////// - bool upgrade() { bool rres = false; @@ -270,6 +74,8 @@ bool solve() /////////////////////////////////////////////////////////////////// +/** +*/ struct ArgList { typedef std::vector<std::string>::const_iterator const_iterator; @@ -307,7 +113,7 @@ struct ArgList std::ostream & operator<<( std::ostream & str, const ArgList & obj ) { - for_( it, 0, obj.get().size() ) + for_( it, 0U, obj.get().size() ) { str << ( it == obj.carg() ? " | " : " " ) << obj.get()[it]; } @@ -318,22 +124,77 @@ std::ostream & operator<<( std::ostream & str, const ArgList & obj ) #define DELGATE(N,F) if ( argv.at(0) == #N ) { argv.poparg(); F( argv ); return; } /////////////////////////////////////////////////////////////////// -void listReposCmd( ArgList & argv ) +void exitCmd( ArgList & argv ) { - errmessage() << "Not inplemented: " << argv << endl; + HEADL << argv << endl; + INT << "===[END]============================================" << endl << endl; + zypp::base::LogControl::TmpLineWriter shutUp; + ::exit( 0 ); } -void listIdent( IdString ident ) +/////////////////////////////////////////////////////////////////// + +void helpCmd( ArgList & argv ) { - HEADL << "list " << ident << endl; + HEADL << argv << endl; + OUT << "list repos - list repos in pool" << endl; + OUT << "list NAME... - list solvables named or providing NAME" << endl; + OUT << "help - this" << endl; + OUT << "exit - exit" << endl; +} - ui::Selectable::Ptr sel( ui::Selectable::get( ident ) ); - OUT << dump(sel) << endl; +/////////////////////////////////////////////////////////////////// + +void listReposCmd( ArgList & argv ) +{ + HEADL << "list repos" << endl; - sat::WhatProvides qp( (Capability( ident.id() )) ); - OUT << "Provided by " << qp << endl; + sat::Pool satpool( test.satpool() ); + for_( it, satpool.reposBegin(), satpool.reposEnd() ) + { + OUT << *it << endl; + } +} +void listIdent( IdString ident_r ) +{ + HEADL << "list " << ident_r << endl; + ui::Selectable::Ptr sel( ui::Selectable::get( ident_r ) ); + if ( sel ) + { + OUT << sel->ident() + << " I" << sel->installedSize() + << " A" << sel->availableSize() + << " " << sel->status() + << endl; + for_( it, sel->installedBegin(), sel->installedEnd() ) + { + OUT << "i " << *it << endl; + } + PoolItem cand( sel->candidateObj() ); + for_( it, sel->availableBegin(), sel->availableEnd() ) + { + OUT << (*it == cand ? "* " : " ") << *it << endl; + } + } + + { + sat::WhatProvides q( (Capability( ident_r.id() )) ); + bool head = true; + for_( it, q.begin(), q.end() ) + { + if ( it->ident() != ident_r ) + { + if ( head ) + { + OUT << "provided by:" << endl; + head = false; + } + OUT << " " << PoolItem( *it ) << endl; + } + } + } } @@ -349,34 +210,43 @@ void listCmd( ArgList & argv ) /////////////////////////////////////////////////////////////////// -bool gocmd( ArgList & argv ) +void gocmd( ArgList & argv ) { + if ( argv.empty() ) + { + helpCmd( argv ); + return; + } + switch ( argv[0][0] ) { -#define DOCMD(n) if ( argv[0] == #n ) { argv.poparg(); n##Cmd( argv ); return true; } case 'e': - if ( argv[0] == "exit" ) { return false; } + DELGATE( exit, exitCmd ); + break; + + case 'h': + DELGATE( help, helpCmd ); break; case 'l': - DOCMD( list ); + DELGATE( list, listCmd ); break; -#undef DOCMD } // no command fall back to list listCmd( argv ); - return true; } void goprompt() { std::cin.tie( &std::cout ); - ArgList argv; + do { - argv.clear(); + ArgList argv; std::cout << "Hallo : "; str::splitEscaped( iostr::getline( std::cin ), std::back_inserter(argv.get()) ); - } while ( argv.empty() || gocmd( argv ) ); + gocmd( argv ); + } while ( true ); + } /////////////////////////////////////////////////////////////////// @@ -407,12 +277,11 @@ int main( int argc, char * argv[] ) } /////////////////////////////////////////////////////////////////// - TestSetup test; + test.loadTestcaseRepos( mtest ); // <<< repos #define GOCMD(c) { ArgList argv( #c ); gocmd( argv ); } - GOCMD( libsndfile ); - GOCMD( libsndfile1 ); - + GOCMD( tgt ); + GOCMD( iscsitarget ); goprompt(); INT << "===[END]============================================" << endl << 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] <libzypp> master : doc and log fixes
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/master commit a03d34c6856ffcc8397419d9c4cbed0b60f3183b Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 12:52:22 2009 +0200 doc and log fixes --- zypp/Repository.cc | 4 +++- zypp/parser/HistoryLogReader.h | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/zypp/Repository.cc b/zypp/Repository.cc index 31decf0..7294e40 100644 --- a/zypp/Repository.cc +++ b/zypp/Repository.cc @@ -204,6 +204,8 @@ namespace zypp // subpriority is used to e.g. prefer http over dvd iff // both have same priority. _repo->subpriority = media::MediaPriority( info_r.url() ); + + MIL << *this << endl; } void Repository::clearInfo() @@ -294,7 +296,7 @@ namespace zypp return str << "sat::repo(" << obj.alias() << ")" << "{" - << "prio " << obj.get()->priority + << "prio " << obj.get()->priority << '.' << obj.get()->subpriority << ", size " << obj.solvablesSize() << "}"; } diff --git a/zypp/parser/HistoryLogReader.h b/zypp/parser/HistoryLogReader.h index 45ecd27..e31eb91 100644 --- a/zypp/parser/HistoryLogReader.h +++ b/zypp/parser/HistoryLogReader.h @@ -7,11 +7,11 @@ | | \---------------------------------------------------------------------*/ -/** \file HistoryLogReader.h +/** \file zypp/parser/HistoryLogReader.h * */ -#ifndef ZYPP_HISTORYLOGREADER_H_ -#define ZYPP_HISTORYLOGREADER_H_ +#ifndef ZYPP_PARSER_HISTORYLOGREADER_H_ +#define ZYPP_PARSER_HISTORYLOGREADER_H_ #include "zypp/base/PtrTypes.h" #include "zypp/ProgressData.h" @@ -45,7 +45,7 @@ namespace zypp * { * vector<HistoryItem::Ptr> items; * - * bool processEntry( const HistoryItem::Ptr & item_ptr ) + * bool operator()( const HistoryItem::Ptr & item_ptr ) * { * items.push_back(item_ptr); * return true; @@ -150,4 +150,4 @@ namespace zypp } // namespace zypp /////////////////////////////////////////////////////////////////// -#endif /* ZYPP_HISTORYLOGREADER_H_ */ +#endif /* ZYPP_PARSER_HISTORYLOGREADER_H_ */ -- 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 : improve TestSetup testcase loading
by Michael Andres 08 May '09

08 May '09

ref: refs/heads/master commit 0f6f54793bb92d2bbdd68d5cf524574f026984ab Author: Michael Andres <ma(a)suse.de> Date: Fri May 8 12:51:19 2009 +0200 improve TestSetup testcase loading --- devel/devel.ma/DumpSolv.cc | 176 ++++++++++++++++++++++++++++++++++---------- tests/lib/TestSetup.h | 77 ++++++++++++++++++- 2 files changed, 210 insertions(+), 43 deletions(-) diff --git a/devel/devel.ma/DumpSolv.cc b/devel/devel.ma/DumpSolv.cc index 0972d99..a5ba541 100644 --- a/devel/devel.ma/DumpSolv.cc +++ b/devel/devel.ma/DumpSolv.cc @@ -1,10 +1,12 @@ #include "Tools.h" + #include <zypp/ResObjects.h> #include <zypp/ProgressData.h> #include <zypp/sat/WhatObsoletes.h> #include "zypp/pool/GetResolvablesToInsDel.h" /////////////////////////////////////////////////////////////////// +#if 0 #include "zypp/parser/xml/ParseDef.h" #include "zypp/parser/xml/ParseDefConsume.h" #include "zypp/parser/xml/Reader.h" @@ -190,13 +192,20 @@ namespace zypp }; }; } +#endif /////////////////////////////////////////////////////////////////// static std::string appname( __FILE__ ); -void message( const std::string & msg_r ) +#define OUT USR +#define HEADL SEC << "===> " + +inline std::ostream & errmessage( const std::string & msg_r = std::string() ) { - cerr << "*** " << msg_r << endl; + cerr << "*** "; + if ( ! msg_r.empty() ) + cerr << msg_r << endl; + return cerr; } int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) @@ -204,7 +213,7 @@ int usage( const std::string & msg_r = std::string(), int exit_r = 100 ) if ( ! msg_r.empty() ) { cerr << endl; - message( msg_r ); + errmessage( msg_r ); cerr << endl; } cerr << "Usage: " << appname << " TESTCASE" << endl; @@ -261,6 +270,117 @@ bool solve() /////////////////////////////////////////////////////////////////// +struct ArgList +{ + typedef std::vector<std::string>::const_iterator const_iterator; + + ArgList() + {} + + ArgList( const std::string & line_r ) + { str::splitEscaped( line_r, std::back_inserter(_argv) ); } + + const_iterator begin() const { const_iterator ret =_argv.begin(); for ( unsigned i = _carg; i; --i ) ++ret; return ret; } + const_iterator end() const { return _argv.end(); } + + void clear() { _argv.clear(); _carg = 0; } + bool empty() const { return _argv.size() == _carg; } + unsigned size() const { return _argv.size() - _carg; } + + std::string & operator[]( int idx ) { return _argv[_carg+idx]; } + const std::string & operator[]( int idx ) const { return _argv[_carg+idx]; } + + std::string at( int idx ) const { return _carg+idx < _argv.size() ? _argv[_carg+idx] : std::string(); } + + unsigned carg() const { return _carg; } + void poparg( int cnt = 1 ) { _carg = arange( _carg + cnt ); } + + public: + std::vector<std::string> & get() { return _argv; } + const std::vector<std::string> & get() const { return _argv; } + private: + unsigned arange( int idx ) const { return idx < 0 ? 0 : std::min( unsigned(idx), _argv.size() ); } + private: + DefaultIntegral<unsigned,0> _carg; + std::vector<std::string> _argv; +}; + +std::ostream & operator<<( std::ostream & str, const ArgList & obj ) +{ + for_( it, 0, obj.get().size() ) + { + str << ( it == obj.carg() ? " | " : " " ) << obj.get()[it]; + } + return str; +} + +/////////////////////////////////////////////////////////////////// +#define DELGATE(N,F) if ( argv.at(0) == #N ) { argv.poparg(); F( argv ); return; } +/////////////////////////////////////////////////////////////////// + +void listReposCmd( ArgList & argv ) +{ + errmessage() << "Not inplemented: " << argv << endl; +} + +void listIdent( IdString ident ) +{ + HEADL << "list " << ident << endl; + + ui::Selectable::Ptr sel( ui::Selectable::get( ident ) ); + OUT << dump(sel) << endl; + + sat::WhatProvides qp( (Capability( ident.id() )) ); + OUT << "Provided by " << qp << endl; + + +} + + +void listCmd( ArgList & argv ) +{ + DELGATE( repos, listReposCmd ); + + for_( it, argv.begin(), argv.end() ) + { + listIdent( IdString(*it) ); + } +} + +/////////////////////////////////////////////////////////////////// + +bool gocmd( ArgList & argv ) +{ + switch ( argv[0][0] ) + { +#define DOCMD(n) if ( argv[0] == #n ) { argv.poparg(); n##Cmd( argv ); return true; } + case 'e': + if ( argv[0] == "exit" ) { return false; } + break; + + case 'l': + DOCMD( list ); + break; +#undef DOCMD + } + // no command fall back to list + listCmd( argv ); + return true; +} + +void goprompt() +{ + std::cin.tie( &std::cout ); + ArgList argv; + do { + argv.clear(); + std::cout << "Hallo : "; + str::splitEscaped( iostr::getline( std::cin ), std::back_inserter(argv.get()) ); + } while ( argv.empty() || gocmd( argv ) ); +} + +/////////////////////////////////////////////////////////////////// + /****************************************************************** ** ** FUNCTION NAME : main @@ -272,52 +392,28 @@ int main( int argc, char * argv[] ) appname = Pathname::basename( argv[0] ); --argc; ++argv; - /////////////////////////////////////////////////////////////////// - Pathname mtest( "/suse/ma/BUGS/472099/zypper.solverTestCase" ); - Arch march( Arch_i686 ); + if ( !argc ) + return usage(); - while ( argc ) - { - --argc; - ++argv; - } + Pathname mtest( *argv ); + --argc; + ++argv; - if ( mtest.empty() ) + if ( ! PathInfo( mtest / "solver-test.xml" ).isFile() ) { - return usage( "Missing Testcase", 102 ); + return usage( "No testcase at " + mtest.asString() ); } /////////////////////////////////////////////////////////////////// + TestSetup test; + test.loadTestcaseRepos( mtest ); // <<< repos +#define GOCMD(c) { ArgList argv( #c ); gocmd( argv ); } + GOCMD( libsndfile ); + GOCMD( libsndfile1 ); - //xml::ParseDef::_debug = true; - SolverTestXml solvertest; - solvertest.parse( mtest ); - USR << solvertest.systemFile << endl; - USR << solvertest.systemArch << endl; - - INT << "===[END]============================================" << endl << endl; - return 0; - - TestSetup test( march ); - ResPool pool( test.pool() ); - sat::Pool satpool( test.satpool() ); - - { - //zypp::base::LogControl::TmpLineWriter shutUp; - test.loadTarget(); - test.loadTestcaseRepos( mtest ); // <<< repos - } - test.poolProxy().saveState(); - - { - //zypp::base::LogControl::TmpLineWriter shutUp; - upgrade(); - } - vdumpPoolStats( USR << "Transacting:"<< endl, - make_filter_begin<resfilter::ByTransact>(pool), - make_filter_end<resfilter::ByTransact>(pool) ) << endl; + goprompt(); INT << "===[END]============================================" << endl << endl; zypp::base::LogControl::TmpLineWriter shutUp; diff --git a/tests/lib/TestSetup.h b/tests/lib/TestSetup.h index 1200972..2839db4 100644 --- a/tests/lib/TestSetup.h +++ b/tests/lib/TestSetup.h @@ -9,6 +9,8 @@ using boost::unit_test::test_case; #include "zypp/base/LogControl.h" #include "zypp/base/LogTools.h" +#include "zypp/base/InputStream.h" +#include "zypp/base/IOStream.h" #include "zypp/base/Flags.h" #include "zypp/ZYppFactory.h" #include "zypp/ZYpp.h" @@ -31,6 +33,18 @@ using namespace zypp; #define LABELED(V) #V << ":\t" << V +inline std::string getXmlNodeVal( const std::string & line_r, const std::string & node_r ) +{ + std::string::size_type pos = line_r.find( node_r + "=\"" ); + if ( pos != std::string::npos ) + { + pos += node_r.size() + 2; + std::string::size_type epos = line_r.find( "\"", pos ); + return line_r.substr( pos, epos-pos ); + } + return std::string(); +} + enum TestSetupOptionBits { TSO_CLEANROOT = (1 << 0) @@ -158,6 +172,14 @@ class TestSetup void loadRepo( const char * loc_r, const std::string & alias_r = std::string() ) { loadRepo( std::string( loc_r ? loc_r : "" ), alias_r ); } + private: + // repo data from solver-test.xml + struct RepoD { + DefaultIntegral<unsigned,0> priority; + std::string alias; + Url url; + }; + public: /** Directly load a helix repo from some testcase. * An empty alias is guessed. @@ -173,11 +195,50 @@ class TestSetup // Load repos included in a solver testcase. void loadTestcaseRepos( const Pathname & path_r ) { - if ( ! filesystem::PathInfo( path_r ).isDir() ) + filesystem::PathInfo pi( path_r / "solver-test.xml" ); + if ( ! pi.isFile() ) { - ERR << "No dir " << filesystem::PathInfo( path_r ) << endl; + ERR << "No testcase in " << filesystem::PathInfo( path_r ) << endl; return; } + // dumb parse + InputStream infile( pi.path() ); + Arch sysarch( Arch_empty ); + Url guessedUrl; + typedef std::map<std::string,RepoD> RepoI; + RepoI repoi; + for( iostr::EachLine in( infile ); in; in.next() ) + { + if ( str::hasPrefix( *in, "\t<channel" ) ) + { + RepoD & repod( repoi[getXmlNodeVal( *in, "file" )] ); + + repod.alias = getXmlNodeVal( *in, "name" ); + repod.priority = str::strtonum<unsigned>( getXmlNodeVal( *in, "priority" ) ); + repod.url = guessedUrl; + guessedUrl = Url(); + } + else if ( str::hasPrefix( *in, "\t- url " ) ) + { + std::string::size_type pos = in->find( ": " ); + if ( pos != std::string::npos ) + { + guessedUrl = Url( in->substr( pos+2 ) ); + } + } + else if ( str::hasPrefix( *in, "\t<locale" ) ) + { + satpool().addRequestedLocale( Locale( getXmlNodeVal( *in, "name" ) ) ); + } + else if ( sysarch.empty() && str::hasPrefix( *in, "<setup" ) ) + { + sysarch = Arch( getXmlNodeVal( *in, "arch" ) ); + if ( ! sysarch.empty() ) + ZConfig::instance().setSystemArchitecture( sysarch ); + } + } + + // filesystem::Glob files( path_r/"*{.xml,.xml.gz}", filesystem::Glob::_BRACE ); for_( it, files.begin(), files.end() ) { @@ -187,8 +248,18 @@ class TestSetup if ( str::hasPrefix( basename, "solver-system.xml" ) ) loadTargetHelix( *it ); else - loadHelix( *it ); + { + const RepoD & repod( repoi[basename] ); + + RepoInfo nrepo; + nrepo.setAlias( repod.alias.empty() ? basename : repod.alias ); + nrepo.setPriority( repod.priority ); + nrepo.setBaseUrl( repod.url ); + satpool().addRepoHelix( *it, nrepo ); + } } + + poolProxy(); // prepare } public: -- 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 : - kill old dataiterator_match_obsolete function
by Michael Schroeder 07 May '09

07 May '09

ref: refs/heads/master commit b9856eb4513fdfa535b94ca9d1bc324f5fe63402 Author: Michael Schroeder <mls(a)suse.de> Date: Thu May 7 14:30:54 2009 +0200 - kill old dataiterator_match_obsolete function --- src/repo.h | 3 --- src/repodata.c | 13 ------------- 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/src/repo.h b/src/repo.h index 8c097ef..70ded77 100644 --- a/src/repo.h +++ b/src/repo.h @@ -278,9 +278,6 @@ void dataiterator_jump_to_solvid(Dataiterator *di, Id solvid); void dataiterator_jump_to_repo(Dataiterator *di, Repo *repo); void dataiterator_entersub(Dataiterator *di); -/* to be removed ... */ -int dataiterator_match_obsolete(Dataiterator *di, int flags, const void *match); - void repo_set_id(Repo *repo, Id p, Id keyname, Id id); void repo_set_num(Repo *repo, Id p, Id keyname, Id num); void repo_set_str(Repo *repo, Id p, Id keyname, const char *str); diff --git a/src/repodata.c b/src/repodata.c index fc7798c..be386e4 100644 --- a/src/repodata.c +++ b/src/repodata.c @@ -1392,19 +1392,6 @@ dataiterator_match(Dataiterator *di, Datamatcher *ma) return datamatcher_match(ma, di->kv.str); } -int -dataiterator_match_obsolete(Dataiterator *di, int flags, const void *vmatch) -{ - Datamatcher matcher; - - if (!repodata_stringify(di->pool, di->data, di->key, &di->kv, flags)) - return 0; - matcher = di->matcher; - matcher.flags = flags; - matcher.match = (void *)vmatch; - return datamatcher_match(&matcher, di->kv.str); -} - /************************************************************************ * data modify functions -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0