January 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> - stay in weakmap boundaries
by Michael Schroeder 29 Jan '09

29 Jan '09

commit cb2c84cb258e110004597de1582421ac151a7fb2 Author: Michael Schroeder <mls(a)suse.de> Date: Thu Jan 29 17:05:01 2009 +0100 - stay in weakmap boundaries --- src/solver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/solver.c b/src/solver.c index bbc598f..165e39e 100644 --- a/src/solver.c +++ b/src/solver.c @@ -766,7 +766,7 @@ makeruledecisions(Solver *solv) r = solv->rules + ri; if (r->d < 0 || r->w2) /* disabled or no assertion */ continue; - if (!MAPTST(&solv->weakrulemap, ri)) /* skip non-weak */ + if (ri >= solv->learntrules || !MAPTST(&solv->weakrulemap, ri)) /* skip non-weak */ continue; v = r->p; vv = v > 0 ? v : -v; -- 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] <cmpi-zypp> fix indenting
by Michael Calmer 29 Jan '09

29 Jan '09

commit 581ffdd341700cd3ba45caba284093f9f50d78ca Author: Michael Calmer <mc(a)suse.de> Date: Thu Jan 29 16:36:19 2009 +0100 fix indenting --- src/SUSE_AssocFilter.h | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/SUSE_AssocFilter.h b/src/SUSE_AssocFilter.h index f1f7b26..95f4d5b 100644 --- a/src/SUSE_AssocFilter.h +++ b/src/SUSE_AssocFilter.h @@ -7,20 +7,20 @@ namespace cmpizypp { class SUSE_AssocFilter { - public: - SUSE_AssocFilter() {}; - virtual ~SUSE_AssocFilter() {}; + public: + SUSE_AssocFilter() {}; + virtual ~SUSE_AssocFilter() {}; - virtual bool filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const - { - _CMPIZYPP_TRACE(1,("--- AssocFilter::filterInstance() called")); - return true; - }; - virtual bool filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const - { - _CMPIZYPP_TRACE(1,("--- AssocFilter::filterObjectPath() called")); - return true; - } + virtual bool filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- AssocFilter::filterInstance() called")); + return true; + }; + virtual bool filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- AssocFilter::filterObjectPath() called")); + return true; + } }; } // namespace cmpizypp -- 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] <cmpi-zypp> changes
by Michael Andres 28 Jan '09

28 Jan '09

commit 7b920b8b0502c04d504ed4a2616478088a659858 Author: Michael Andres <ma(a)suse.de> Date: Wed Jan 28 14:41:24 2009 +0100 changes --- VERSION.cmake | 2 +- package/cmpi-zypp.changes | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index b555065..43c33c4 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,7 +61,7 @@ SET(CMPIZYPP_MAJOR "0") SET(CMPIZYPP_COMPATMINOR "0") SET(CMPIZYPP_MINOR "0") -SET(CMPIZYPP_PATCH "2") +SET(CMPIZYPP_PATCH "3") # # LAST RELEASED: 0.0.0 (0) # (The number in parenthesis is CMPIZYPP_COMPATMINOR) diff --git a/package/cmpi-zypp.changes b/package/cmpi-zypp.changes index a57be02..e41a1df 100644 --- a/package/cmpi-zypp.changes +++ b/package/cmpi-zypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jan 28 14:36:27 CET 2009 - ma(a)suse.de + +- version 0.0.3 + * improve and implement missing association filters + * Basic Software Inventory Profile is done + +------------------------------------------------------------------- Tue Jan 27 16:07:54 CET 2009 - mc(a)suse.de - version 0.0.2 -- 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> changes
by Ján Kupec 28 Jan '09

28 Jan '09

commit d3bc86e481837294d2cdc47239388cc072ff5eba Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Jan 28 14:38:22 2009 +0100 changes --- package/libzypp.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index cafad24..fd39fa3 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jan 28 14:37:28 CET 2009 - jkupec(a)suse.cz + +- HistoryLogReader added + +------------------------------------------------------------------- Tue Jan 27 13:35:44 CET 2009 - ma(a)suse.de - Respect content-file DATDIR when downloading packages. (bnc #468612) -- 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> backup
by Ján Kupec 28 Jan '09

28 Jan '09

commit fff2dcb58ab85b590c7c3d511532fd5a3e5460e4 Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Jan 28 14:36:39 2009 +0100 backup --- devel/devel.jkupec/play.cc | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/devel/devel.jkupec/play.cc b/devel/devel.jkupec/play.cc index 4852540..5133d74 100644 --- a/devel/devel.jkupec/play.cc +++ b/devel/devel.jkupec/play.cc @@ -1,6 +1,7 @@ #include <iostream> #include "zypp/base/LogTools.h" +#include "zypp/ZYppCallbacks.h" #include "zypp/parser/HistoryLogReader.h" #include "zypp/parser/ParseException.h" @@ -9,14 +10,20 @@ using std::endl; using std::cout; using namespace zypp; +bool progress_function(const ProgressData & p) +{ + cout << "."; + return true; +} + struct HistoryItemCollector { -// vector<HistoryItem::Ptr> items; + std::vector<HistoryItem::Ptr> items; bool operator()( const HistoryItem::Ptr & item_ptr ) { -// items.insert(item); - cout << *item_ptr << endl; + items.push_back(item_ptr); + //cout << *item_ptr << endl; return true; } }; @@ -28,18 +35,22 @@ int main( int argc, const char * argv[] ) --argc; ++argv; // skip arg 0 HistoryItemCollector ic; - parser::HistoryLogReader reader(*argv, ic); - + parser::HistoryLogReader reader(*argv, boost::ref(ic)); + reader.setIgnoreInvalidItems(true); + ProgressReportReceiver progress; + progress.connect(); try { - reader.readAll(); + //reader.readAll(&progress_function); + reader.readFromTo(Date("2009-01-01", "%Y-%m-%d"), Date("2009-01-02", "%Y-%m-%d")); } catch (const parser::ParseException & e) { cout << "error in " << *argv << ":" << endl; cout << e.asUserHistory() << endl; } + progress.disconnect(); - cout << "done" << endl; + cout << "got " << ic.items.size() << endl; return 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] <libzypp> HistoryLogReader::readFrom() and readFromTo() added.
by Ján Kupec 28 Jan '09

28 Jan '09

commit d3c4ddd460cc2c4aa2d586799ea7070c96203ab5 Author: Ján Kupec <jkupec(a)suse.cz> Date: Wed Jan 28 14:35:53 2009 +0100 HistoryLogReader::readFrom() and readFromTo() added. --- zypp/parser/HistoryLogReader.cc | 167 ++++++++++++++++++++++++++++++-------- zypp/parser/HistoryLogReader.h | 27 ++++++- 2 files changed, 158 insertions(+), 36 deletions(-) diff --git a/zypp/parser/HistoryLogReader.cc b/zypp/parser/HistoryLogReader.cc index e339a76..511b7d0 100644 --- a/zypp/parser/HistoryLogReader.cc +++ b/zypp/parser/HistoryLogReader.cc @@ -42,8 +42,14 @@ namespace zypp {} HistoryItem::Ptr createHistoryItem(HistoryItem::FieldVector & fields); + void parseLine(const string & line, unsigned int lineNr); void readAll(const ProgressData::ReceiverFnc & progress); + void readFrom(const Date & date, + const ProgressData::ReceiverFnc & progress); + void readFromTo( + const Date & fromDate, const Date & toDate, + const ProgressData::ReceiverFnc & progress); Pathname _filename; ProcessItem _callback; @@ -92,6 +98,54 @@ namespace zypp return HistoryItem::Ptr(); } + void HistoryLogReader::Impl::parseLine(const string & line, unsigned int lineNr) + { + HistoryItem::FieldVector fields; + HistoryItem::Ptr item_ptr; + + // parse into fields + str::splitEscaped(line, back_inserter(fields), "|", true); + + if (fields.size() <= 2) + { + ParseException + e(str::form("Error in history log on line #%u.", lineNr)); + e.addHistory( + str::form("Bad number of fields. Got %ld, expected more than %d.", + fields.size(), 2)); + ZYPP_THROW(e); + } + + try + { + item_ptr = createHistoryItem(fields); + } + catch (const Exception & e) + { + ZYPP_CAUGHT(e); + ERR << "Invalid history log entry on line #" << lineNr << ":" << endl + << line << endl; + + if (!_ignoreInvalid) + { + ParseException newe( + str::form("Error in history log on line #%u.", lineNr ) ); + newe.remember(e); + ZYPP_THROW(newe); + } + } + + if (item_ptr) + _callback(item_ptr); + else if (!_ignoreInvalid) + { + ParseException + e(str::form("Error in history log on line #%u.", lineNr)); + e.addHistory("Unknown entry type."); + ZYPP_THROW(e); + } + } + void HistoryLogReader::Impl::readAll(const ProgressData::ReceiverFnc & progress) { InputStream is(_filename); @@ -101,55 +155,89 @@ namespace zypp pd.sendTo( progress ); pd.toMin(); - HistoryItem::FieldVector fields; - HistoryItem::Ptr item_ptr; - for (; line; line.next(), pd.tick(), fields.clear(), item_ptr.reset()) + for (; line; line.next(), pd.tick() ) { - const string & s = *line; - if (s[0] == '#') // ignore comments + // ignore comments + if ((*line)[0] == '#') continue; - // parse fields - str::splitEscaped(s, back_inserter(fields), "|", true); + parseLine(*line, line.lineNo()); + } - if (fields.size() <= 2) - ZYPP_THROW(ParseException( - str::form("Bad number of fields. Got %ld, expected more than %d.", - fields.size(), 2))); + pd.toMax(); + } - try - { - item_ptr = createHistoryItem(fields); - } - catch (const Exception & e) - { - ZYPP_CAUGHT(e); - ERR << "Invalid history log entry on line #" << line.lineNo() << ":" << endl - << s << endl; + void HistoryLogReader::Impl::readFrom(const Date & date, + const ProgressData::ReceiverFnc & progress) + { + InputStream is(_filename); + iostr::EachLine line(is); - if (!_ignoreInvalid) - { - ParseException newe( - str::form("Error in history log on line #%u.", line.lineNo() ) ); - newe.remember(e); - ZYPP_THROW(newe); - } - } + ProgressData pd; + pd.sendTo( progress ); + pd.toMin(); + + bool pastDate = false; + for (; line; line.next(), pd.tick()) + { + const string & s = *line; - if (item_ptr) - _callback(item_ptr); - else if (!_ignoreInvalid) + // ignore comments + if (s[0] == '#') + continue; + + if (pastDate) + parseLine(s, line.lineNo()); + else { - ParseException - e(str::form("Error in history log on line #%u.", line.lineNo())); - e.addHistory("Unknown entry type."); - ZYPP_THROW(e); + Date logDate(s.substr(0, s.find('|')), HISTORY_LOG_DATE_FORMAT); + if (logDate > date) + { + pastDate = true; + parseLine(s, line.lineNo()); + } } } pd.toMax(); } + void HistoryLogReader::Impl::readFromTo( + const Date & fromDate, const Date & toDate, + const ProgressData::ReceiverFnc & progress) + { + InputStream is(_filename); + iostr::EachLine line(is); + + ProgressData pd; + pd.sendTo(progress); + pd.toMin(); + + bool pastFromDate = false; + for (; line; line.next(), pd.tick()) + { + const string & s = *line; + + // ignore comments + if (s[0] == '#') + continue; + + Date logDate(s.substr(0, s.find('|')), HISTORY_LOG_DATE_FORMAT); + + // past toDate - stop reading + if (logDate >= toDate) + break; + + // past fromDate - start reading + if (!pastFromDate && logDate > fromDate) + pastFromDate = true; + + if (pastFromDate) + parseLine(s, line.lineNo()); + } + + pd.toMax(); + } ///////////////////////////////////////////////////////////////////// // @@ -174,6 +262,15 @@ namespace zypp void HistoryLogReader::readAll(const ProgressData::ReceiverFnc & progress) { _pimpl->readAll(progress); } + void HistoryLogReader::readFrom(const Date & date, + const ProgressData::ReceiverFnc & progress) + { _pimpl->readFrom(date, progress); } + + void HistoryLogReader::readFromTo( + const Date & fromDate, const Date & toDate, + const ProgressData::ReceiverFnc & progress) + { _pimpl->readFromTo(fromDate, toDate, progress); } + ///////////////////////////////////////////////////////////////// } // namespace parser diff --git a/zypp/parser/HistoryLogReader.h b/zypp/parser/HistoryLogReader.h index 7cc4b29..45ecd27 100644 --- a/zypp/parser/HistoryLogReader.h +++ b/zypp/parser/HistoryLogReader.h @@ -36,7 +36,7 @@ namespace zypp // /** * Reads a zypp history log file and calls the ProcessItem function passed - * in the constructor for each item found. + * in the constructor for each item read. * * Example: * <code> @@ -82,18 +82,41 @@ namespace zypp /** * Read the whole log file. + * + * \param progress An optional progress data receiver function. */ void readAll( const ProgressData::ReceiverFnc &progress = ProgressData::ReceiverFnc() ); /** * Read log from specified \a date. + * + * \param date Date from which to read. + * \param progress An optional progress data receiver function. + * + * \see readFromTo() */ void readFrom( const Date & date, const ProgressData::ReceiverFnc &progress = ProgressData::ReceiverFnc() ); /** * Read log between \a fromDate and \a toDate. + * + * The date comparison's precision goes to seconds. Omitted time parts + * get replaced by zeroes, so if e.g. the time is not specified at all, the + * date means midnight of the specified date. So + * + * <code> + * fromDate = Date("2009-01-01", "%Y-%m-%d"); + * toDate = Date("2009-01-02", "%Y-%m-%d"); + * </code> + * + * will yield log entries from midnight of January, 1st untill + * one second before midnight of January, 2nd. + * + * \param fromDate Date from which to read. + * \param toDate Date on which to stop reading. + * \param progress An optional progress data receiver function. */ void readFromTo( const Date & fromDate, const Date & toDate, const ProgressData::ReceiverFnc &progress = ProgressData::ReceiverFnc() ); @@ -107,6 +130,8 @@ namespace zypp /** * Whether the reader is set to ignore invalid log entries. + * + * \see setIngoreInvalidItems() */ bool ignoreInvalidItems() 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] <cmpi-zypp> Pass source ObjectPath and Role to AssocFilter methods
by Michael Andres 28 Jan '09

28 Jan '09

commit 5d59aef409659273952fa297bede04f0410fdb70 Author: Michael Andres <ma(a)suse.de> Date: Wed Jan 28 14:15:45 2009 +0100 Pass source ObjectPath and Role to AssocFilter methods --- src/SUSE_AssocFilter.h | 5 +- src/SUSE_Common.cc | 8 ++-- src/SUSE_HostedCollectionProvider.cc | 68 +++++++----------------- src/SUSE_HostedCollectionProvider.h | 4 +- src/SUSE_InstalledSoftwareIdentityProvider.cc | 53 +++++++++---------- src/SUSE_InstalledSoftwareIdentityProvider.h | 4 +- src/SUSE_MemberOfCollectionProvider.cc | 70 ++++++++++++++----------- 7 files changed, 94 insertions(+), 118 deletions(-) diff --git a/src/SUSE_AssocFilter.h b/src/SUSE_AssocFilter.h index fcc6ad2..f1f7b26 100644 --- a/src/SUSE_AssocFilter.h +++ b/src/SUSE_AssocFilter.h @@ -11,13 +11,12 @@ namespace cmpizypp SUSE_AssocFilter() {}; virtual ~SUSE_AssocFilter() {}; - virtual bool filterInstance(const CmpiInstance &ci, bool associators) const + virtual bool filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const { _CMPIZYPP_TRACE(1,("--- AssocFilter::filterInstance() called")); return true; }; - - virtual bool filterObjectPath(const CmpiObjectPath &op, bool associators) const + virtual bool filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const { _CMPIZYPP_TRACE(1,("--- AssocFilter::filterObjectPath() called")); return true; diff --git a/src/SUSE_Common.cc b/src/SUSE_Common.cc index 647a211..2ba0fd3 100644 --- a/src/SUSE_Common.cc +++ b/src/SUSE_Common.cc @@ -189,7 +189,7 @@ namespace cmpizypp while (en.hasNext() ) { CmpiInstance ci = en.getNext(); - if( filter.filterInstance(ci, true) ) + if( filter.filterInstance(cop, _RefSource, ci, true) ) rslt.returnData( ci ); } } @@ -222,13 +222,13 @@ namespace cmpizypp /* associators = 0 && inst = 0 */ CmpiObjectPath tmp = ci.getObjectPath(); tmp.setNameSpace(cop.getNameSpace()); - if( filter.filterObjectPath(tmp, false) ) + if( filter.filterObjectPath(cop, _RefSource, tmp, false) ) rslt.returnData(tmp); } else { /* associators = 0 && inst = 1 */ - if( filter.filterInstance(ci, false) ) + if( filter.filterInstance(cop, _RefSource, ci, false) ) rslt.returnData(ci); } } @@ -238,7 +238,7 @@ namespace cmpizypp //rslt.returnData(data); CmpiObjectPath tmp = (CmpiObjectPath)data; tmp.setNameSpace(cop.getNameSpace()); - if( filter.filterObjectPath(tmp, true) ) + if( filter.filterObjectPath(cop, _RefSource, tmp, true) ) rslt.returnData(tmp); } } diff --git a/src/SUSE_HostedCollectionProvider.cc b/src/SUSE_HostedCollectionProvider.cc index 670394a..7cf0d16 100644 --- a/src/SUSE_HostedCollectionProvider.cc +++ b/src/SUSE_HostedCollectionProvider.cc @@ -212,10 +212,18 @@ namespace cmpizypp , csop(op) { } - bool SUSE_HostedCollectionFilter::filterInstance(const CmpiInstance &ci, bool associators) const + bool SUSE_HostedCollectionFilter::filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const { _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance called")); - USR << ci << endl; + return filterObjectPath( scop, _RefSource, ci.getObjectPath(), associators ); + + } + + bool SUSE_HostedCollectionFilter::filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterObjectPath called")); + USR << scop << " " <<_RefSource << ": " << op << endl; + CmpiString CSName = csop.getKey("CreationClassName"); CmpiString Name = csop.getKey("Name"); @@ -223,21 +231,22 @@ namespace cmpizypp const char *filterName = ""; if( ! associators ) { - CmpiObjectPath filterop = ci.getProperty( _RefLeft ); + CmpiObjectPath filterop = op.getKey( _RefLeft ); filterCSName = filterop.getKey("CreationClassName"); filterName = filterop.getKey("Name"); } else { - CmpiInstance lci( ci ); - if( lci.instanceIsA( _RefLeftClass ) ) + if ( ::strcmp(_RefSource, _RefLeft ) != 0 ) { - _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance exited: true")); - return true; + filterCSName = op.getKey("CreationClassName"); + filterName = op.getKey("Name"); + } + else + { + filterCSName = scop.getKey("CreationClassName"); + filterName = scop.getKey("Name"); } - - filterCSName = ci.getProperty("CreationClassName"); - filterName = ci.getProperty("Name"); } if(CSName.equals(filterCSName) && Name.equals(filterName) ) @@ -250,44 +259,7 @@ namespace cmpizypp _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance exited: false")); return false; } - } - - bool SUSE_HostedCollectionFilter::filterObjectPath(const CmpiObjectPath &op, bool associators) const - { - _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterObjectPath called")); - USR << op << endl; - CmpiString CSName = csop.getKey("CreationClassName"); - CmpiString Name = csop.getKey("Name"); - - CmpiObjectPath filterop("", ""); - if( ! associators ) - { - filterop = op.getKey( _RefLeft ); - } - else - { - if( op.classPathIsA( _RefLeftClass ) ) - { - _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterObjectPath exited: true")); - return true; - } - - filterop = op; - } - CmpiString filterCSName = filterop.getKey("CreationClassName"); - CmpiString filterName = filterop.getKey("Name"); - - if(filterCSName.equals(CSName) && filterName.equals(Name) ) - { - _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterObjectPath exited: true")); - return true; - } - else - { - _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterObjectPath exited: false")); - return false; - } - } +} } // namespace cmpizypp diff --git a/src/SUSE_HostedCollectionProvider.h b/src/SUSE_HostedCollectionProvider.h index 9b8b7cb..7c20863 100644 --- a/src/SUSE_HostedCollectionProvider.h +++ b/src/SUSE_HostedCollectionProvider.h @@ -49,8 +49,8 @@ namespace cmpizypp SUSE_HostedCollectionFilter(const CmpiObjectPath &op); virtual ~SUSE_HostedCollectionFilter() {}; - virtual bool filterInstance(const CmpiInstance &ci, bool associators) const; - virtual bool filterObjectPath(const CmpiObjectPath &op, bool associators) const; + virtual bool filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const; + virtual bool filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const; }; } // namespace cmpizypp diff --git a/src/SUSE_InstalledSoftwareIdentityProvider.cc b/src/SUSE_InstalledSoftwareIdentityProvider.cc index c90a875..6c7b58a 100644 --- a/src/SUSE_InstalledSoftwareIdentityProvider.cc +++ b/src/SUSE_InstalledSoftwareIdentityProvider.cc @@ -442,45 +442,30 @@ namespace cmpizypp , csop(op) { } - bool SUSE_InstalledSoftwareIdentityFilter::filterInstance(const CmpiInstance &ci, bool associators) const + + bool SUSE_InstalledSoftwareIdentityFilter::filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const { - _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance called")); - USR << ci << endl; - CmpiString CSName = csop.getKey("CreationClassName"); - CmpiString Name = csop.getKey("Name"); + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterObjectPath called")); + USR << scop << " " <<_RefSource << ": " << op << endl; - const char *filterCSName = ""; - const char *filterName = ""; - if( ! associators ) + if ( strcmp(_RefSource,_RefLeft) != 0 ) { - CmpiObjectPath filterop = ci.getProperty( _RefRight ); - filterCSName = filterop.getKey("CreationClassName"); - filterName = filterop.getKey("Name"); - } - else - { - filterCSName = ci.getProperty("CreationClassName"); - filterName = ci.getProperty("Name"); + INT << "Unexpected filter!" << endl; + return false; } - if(CSName.equals(filterCSName) && Name.equals(filterName) ) + const char * instanceId = scop.getKey("InstanceId"); + if ( ! instanceId ) { - _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance exited: true")); - return true; + INT << "No instance Id!" << endl; + return false; } - else + + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( instanceId ) ) { - _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance exited: false")); + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterObjectPath exited: false")); return false; } - } - - bool SUSE_InstalledSoftwareIdentityFilter::filterObjectPath(const CmpiObjectPath &op, bool associators) const - { - _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterObjectPath called")); - USR << op << endl; - CmpiString CSName = csop.getKey("CreationClassName"); - CmpiString Name = csop.getKey("Name"); CmpiObjectPath filterop("", ""); if( ! associators ) @@ -491,6 +476,10 @@ namespace cmpizypp { filterop = op; } + + CmpiString CSName = csop.getKey("CreationClassName"); + CmpiString Name = csop.getKey("Name"); + CmpiString filterCSName = filterop.getKey("CreationClassName"); CmpiString filterName = filterop.getKey("Name"); @@ -507,6 +496,12 @@ namespace cmpizypp } + bool SUSE_InstalledSoftwareIdentityFilter::filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance called")); + return filterObjectPath(scop, _RefSource, ci.getObjectPath(), associators); + } + } // namespace cmpizypp CMProviderBase( SUSE_InstalledSoftwareIdentityProvider ); diff --git a/src/SUSE_InstalledSoftwareIdentityProvider.h b/src/SUSE_InstalledSoftwareIdentityProvider.h index ceee8e8..9739445 100644 --- a/src/SUSE_InstalledSoftwareIdentityProvider.h +++ b/src/SUSE_InstalledSoftwareIdentityProvider.h @@ -48,8 +48,8 @@ namespace cmpizypp SUSE_InstalledSoftwareIdentityFilter(const CmpiObjectPath &op); virtual ~SUSE_InstalledSoftwareIdentityFilter() {}; - virtual bool filterInstance(const CmpiInstance &ci, bool associators) const; - virtual bool filterObjectPath(const CmpiObjectPath &op, bool associators) const; + virtual bool filterInstance(const CmpiObjectPath &scop, const char * _RefSource, const CmpiInstance &ci, bool associators) const; + virtual bool filterObjectPath(const CmpiObjectPath &scop, const char * _RefSource, const CmpiObjectPath &op, bool associators) const; }; } // namespace cmpizypp diff --git a/src/SUSE_MemberOfCollectionProvider.cc b/src/SUSE_MemberOfCollectionProvider.cc index fee0342..bcb60b5 100644 --- a/src/SUSE_MemberOfCollectionProvider.cc +++ b/src/SUSE_MemberOfCollectionProvider.cc @@ -228,13 +228,17 @@ namespace cmpizypp } else // ( cop.classPathIsA(_RefRightClass) ) //SUSE_SoftwareIdentity { - if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 1, 1) ) - { - CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); - _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); - return st; - } + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 1, 1) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } } } @@ -298,16 +302,18 @@ namespace cmpizypp } else // ( cop.classPathIsA(_RefRightClass) ) //SUSE_SoftwareIdentity { - if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 0, 1) ) - { - CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); - _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); - return st; - } + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 0, 1) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } } - - USR << op <<endl; } } @@ -374,16 +380,18 @@ namespace cmpizypp } else //( cop.classPathIsA(_RefRightClass) ) //SUSE_SoftwareIdentity { - if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 1, 0) ) + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) { - CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); - _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); - return st; + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 1, 0) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } } } - - USR << op <<endl; } } @@ -452,16 +460,18 @@ namespace cmpizypp } else // ( cop.classPathIsA(_RefRightClass) ) //SUSE_SoftwareIdentity { - if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 0, 0) ) + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) { - CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); - _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); - return st; + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, 0, 0) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } } } - - USR << op <<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] <cmpi-zypp> Add test for isSystemSoftwareIdentityInstanceId and protect tests against NULL pointer arg.
by Michael Andres 28 Jan '09

28 Jan '09

commit 903cf1a0aaf30e053baf6d7093e412ad93d3e8f0 Author: Michael Andres <ma(a)suse.de> Date: Wed Jan 28 14:13:27 2009 +0100 Add test for isSystemSoftwareIdentityInstanceId and protect tests against NULL pointer arg. --- src/SUSE_zypp.cc | 26 ++++++++++++++++---------- src/SUSE_zypp.h | 4 +++- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/SUSE_zypp.cc b/src/SUSE_zypp.cc index dc04869..bd8d12b 100644 --- a/src/SUSE_zypp.cc +++ b/src/SUSE_zypp.cc @@ -128,42 +128,43 @@ namespace cmpizypp slv.repository().alias().c_str() ) ); } - PoolItem ZyppAC::findSoftwareIdentityInstanceId( const std::string & id_r ) const + PoolItem ZyppAC::findSoftwareIdentityInstanceId( const C_Str & id_r ) const { // SoftwareIdentity::InstanceId = SUSE:<name>-<version>-<release>.<arch>@<repoalias> + const std::string id( id_r ); - if ( ! str::hasPrefix( id_r, "SUSE:" ) ) + if ( ! str::hasPrefix( id, "SUSE:" ) ) return PoolItem(); // check repo - std::string::size_type rdelim( id_r.find( "@" ) ); + std::string::size_type rdelim( id.find( "@" ) ); if ( rdelim == std::string::npos ) return PoolItem(); - Repository repo( sat::Pool::instance().reposFind( id_r.substr( rdelim+1) ) ); + Repository repo( sat::Pool::instance().reposFind( id.substr( rdelim+1) ) ); if ( ! repo ) return PoolItem(); // check n-v-r.a from behind - std::string::size_type delim = id_r.rfind( ".", rdelim ); + std::string::size_type delim = id.rfind( ".", rdelim ); if ( delim == std::string::npos ) return PoolItem(); - Arch arch( id_r.substr( delim+1, rdelim-delim-1 ) ); + Arch arch( id.substr( delim+1, rdelim-delim-1 ) ); // v-r starts at one but last '-' rdelim = delim; - delim = id_r.rfind( "-", rdelim ); + delim = id.rfind( "-", rdelim ); if ( delim == std::string::npos ) return PoolItem(); - delim = id_r.rfind( "-", delim-1 ); + delim = id.rfind( "-", delim-1 ); if ( delim == std::string::npos ) return PoolItem(); - Edition ed( id_r.substr( delim+1, rdelim-delim-1 ) ); + Edition ed( id.substr( delim+1, rdelim-delim-1 ) ); // eveythig before is name (except the leading "SUSE:") - std::string identstring( id_r.substr( 5, delim-5 ) ); + std::string identstring( id.substr( 5, delim-5 ) ); DBG << "Lookup:" << endl; DBG << identstring << endl; @@ -185,4 +186,9 @@ namespace cmpizypp return PoolItem(); } + bool ZyppAC::isSystemSoftwareIdentityInstanceId( const C_Str & id_r ) + { + return str::hasSuffix( id_r, Repository::systemRepoAlias() ); + } + } diff --git a/src/SUSE_zypp.h b/src/SUSE_zypp.h index 6f84e4b..69812bc 100644 --- a/src/SUSE_zypp.h +++ b/src/SUSE_zypp.h @@ -32,9 +32,11 @@ namespace cmpizypp std::string SoftwareIdentityInstanceId( const zypp::sat::Solvable & slv ) const; std::string SoftwareIdentityInstanceId( const zypp::PoolItem & pi ) const { return SoftwareIdentityInstanceId( pi.satSolvable() ); } + /** \see \ref SoftwareIdentityInstanceId */ - zypp::PoolItem findSoftwareIdentityInstanceId( const std::string & id_r ) const; + zypp::PoolItem findSoftwareIdentityInstanceId( const zypp::C_Str & id_r ) const; + static bool isSystemSoftwareIdentityInstanceId( const zypp::C_Str & id_r ); }; } -- 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] <cmpi-zypp> add %debug_package macro to get stripped lib
by Michael Calmer 27 Jan '09

27 Jan '09

commit fbd4fb5e9e25bf11ffd87f8b30e8922f67305071 Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 17:52:40 2009 +0100 add %debug_package macro to get stripped lib --- cmpi-zypp.spec.cmake | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/cmpi-zypp.spec.cmake b/cmpi-zypp.spec.cmake index 738c550..6c73056 100644 --- a/cmpi-zypp.spec.cmake +++ b/cmpi-zypp.spec.cmake @@ -39,6 +39,8 @@ Authors: Michael Andres <ma(a)suse.de> Michael Calmer <mc(a)suse.de> +%debug_package + %prep %setup -q -- 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> changes
by Ján Kupec 27 Jan '09

27 Jan '09

commit f7e6c07b27101381d989f905f743225184c11c04 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 16:46:05 2009 +0100 changes --- VERSION.cmake | 2 +- package/libzypp.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 064650a..d895020 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -61,7 +61,7 @@ SET(LIBZYPP_MAJOR "5") SET(LIBZYPP_COMPATMINOR "23") SET(LIBZYPP_MINOR "27") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_PATCH "2") # # LAST RELEASED: 5.27.1 (23) # (The number in parenthesis is LIBZYPP_COMPATMINOR) diff --git a/package/libzypp.changes b/package/libzypp.changes index 11c9e4c..6f887e9 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 27 16:43:57 CET 2009 - jkupec(a)suse.cz + +- Fixed missing newline at the end of some history log entries. + +------------------------------------------------------------------- Tue Jan 27 14:09:52 CET 2009 - jkupec(a)suse.cz - Enabled CredentialManager for MediaSMB (bnc #460970). -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0