January 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <cmpi-zypp> version 0.0.2
by Michael Calmer 27 Jan '09

27 Jan '09

commit 7e35457eb58324fb182549191935c36a28429c2d Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 16:44:19 2009 +0100 version 0.0.2 --- VERSION.cmake | 2 +- package/cmpi-zypp.changes | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index cc7e6f6..b555065 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 "1") +SET(CMPIZYPP_PATCH "2") # # 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 de0d467..a57be02 100644 --- a/package/cmpi-zypp.changes +++ b/package/cmpi-zypp.changes @@ -1,4 +1,15 @@ ------------------------------------------------------------------- +Tue Jan 27 16:07:54 CET 2009 - mc(a)suse.de + +- version 0.0.2 + * Implement filter for association functions + * make sure that our associations to CIM_System get the correct object + * Require CIM_ComputerSystem + * Be more specific and require our SUSE_* Classes in the + association providers. + * Set IdentityInfoType CIM:SoftwareFamily to "SUSE:<RPM_NAME>" + +------------------------------------------------------------------- Wed Jan 21 11:20:49 CET 2009 - mc(a)suse.de - version 0.0.1 -- 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 BuildRequires: sblim-cmpiutil-devel
by Michael Calmer 27 Jan '09

27 Jan '09

commit af59c603628e021fe02b57c55da013db05554cdc Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 16:44:04 2009 +0100 add BuildRequires: sblim-cmpiutil-devel --- cmpi-zypp.spec.cmake | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/cmpi-zypp.spec.cmake b/cmpi-zypp.spec.cmake index fb36775..738c550 100644 --- a/cmpi-zypp.spec.cmake +++ b/cmpi-zypp.spec.cmake @@ -25,6 +25,7 @@ BuildRequires: cmake BuildRequires: libzypp-devel sblim-cmpi-devel BuildRequires: doxygen gcc-c++ gettext-devel BuildRequires: sblim-sfcb cmpi-provider-register +BuildRequires: sblim-cmpiutil-devel Recommends: sblim-sfcb PreReq: cmpi-provider-register %define mofdir %{_datadir}/%{name}/ -- 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> Missing newline at the end of some log entries.
by Ján Kupec 27 Jan '09

27 Jan '09

commit 44940f040259a66eb14721c4cac287c2b2481e7b Author: Ján Kupec <jkupec(a)suse.cz> Date: Mon Jan 26 08:27:08 2009 +0100 Missing newline at the end of some log entries. --- zypp/HistoryLog.cc | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/zypp/HistoryLog.cc b/zypp/HistoryLog.cc index 7982d35..9d904f7 100644 --- a/zypp/HistoryLog.cc +++ b/zypp/HistoryLog.cc @@ -335,16 +335,18 @@ namespace zypp << timestamp() // 1 timestamp << _sep << HistoryActionID::REPO_CHANGE_ALIAS.asString(true) // 2 action << _sep << str::escape(oldrepo.alias(), _sep) // 3 old alias - << _sep << str::escape(newrepo.alias(), _sep); // 4 new alias + << _sep << str::escape(newrepo.alias(), _sep) // 4 new alias + << endl; } if (*oldrepo.baseUrlsBegin() != *newrepo.baseUrlsBegin()) { _log - << timestamp() // 1 timestamp + << timestamp() //1 timestamp << _sep << HistoryActionID::REPO_CHANGE_URL.asString(true) // 2 action << _sep << str::escape(oldrepo.alias(), _sep) // 3 old url - << _sep << *newrepo.baseUrlsBegin(); // 4 new url + << _sep << *newrepo.baseUrlsBegin() // 4 new url + << 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> update TODO
by Michael Calmer 27 Jan '09

27 Jan '09

commit fd45542ef5b78f32fe1161f6f649710297fbc0e9 Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 15:40:53 2009 +0100 update TODO --- doc/TODO | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/doc/TODO b/doc/TODO index b9ce76c..c65eaaf 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,12 +1,4 @@ -- find one CIM_ComputerSystem for associations of SUSE_InstalledSoftwareIdentity - and SUSE_HostedCollection. Don't know if it is possible that there are more - then one modeled inside of one namespace. - Maybe search for it in every constructor of a provider and store it in - a global variable. We need to store the two keys CreationClassName and Name - -- find a way to provide a filter object to the common assoc_* functions. - - is it possible to release the zypp lock after exit of a provider function? If a new zyppacc object is created, will the lock automatically enabled again? -- 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> Implement filter for association functions
by Michael Calmer 27 Jan '09

27 Jan '09

commit a5f57887f8910d43479d1e1b9839634ca4e6f740 Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 15:40:44 2009 +0100 Implement filter for association functions * Add filter parameter to assoc_* functions * Implement SUSE_AssocFilter as base class for filter objects * Implement SUSE_InstalledSoftwareIdetityFilter * Implement SUSE_HostedCollectionFilter --- src/CMakeLists.txt | 1 + src/SUSE_AssocFilter.h | 29 +++++++ src/SUSE_Common.cc | 53 +++++++++----- src/SUSE_Common.h | 12 ++- src/SUSE_HostedCollectionProvider.cc | 100 +++++++++++++++++++++++-- src/SUSE_HostedCollectionProvider.h | 16 ++++ src/SUSE_InstalledSoftwareIdentityProvider.cc | 83 +++++++++++++++++++- src/SUSE_InstalledSoftwareIdentityProvider.h | 15 ++++ 8 files changed, 278 insertions(+), 31 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f342c8..7d95d11 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -23,6 +23,7 @@ SET( CMPIZYPP_HEADERS SUSE_SystemSpecificCollectionProvider.h SUSE_MemberOfCollectionProvider.h SUSE_HostedCollectionProvider.h + SUSE_AssocFilter.h ) ADD_LIBRARY(cmpi-zypp SHARED ${CMPIZYPP_SRCS}) diff --git a/src/SUSE_AssocFilter.h b/src/SUSE_AssocFilter.h new file mode 100644 index 0000000..fcc6ad2 --- /dev/null +++ b/src/SUSE_AssocFilter.h @@ -0,0 +1,29 @@ +#ifndef SUSE_ASSOCFILTER_H +#define SUSE_ASSOCFILTER_H + +#include "SUSE_zypp.h" + +namespace cmpizypp +{ + class SUSE_AssocFilter + { + public: + SUSE_AssocFilter() {}; + virtual ~SUSE_AssocFilter() {}; + + virtual bool filterInstance(const CmpiInstance &ci, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- AssocFilter::filterInstance() called")); + return true; + }; + + virtual bool filterObjectPath(const CmpiObjectPath &op, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- AssocFilter::filterObjectPath() called")); + return true; + } + }; + +} // namespace cmpizypp + +#endif // SUSE_ASSOCFILTER_H \ No newline at end of file diff --git a/src/SUSE_Common.cc b/src/SUSE_Common.cc index ff24827..647a211 100644 --- a/src/SUSE_Common.cc +++ b/src/SUSE_Common.cc @@ -1,12 +1,12 @@ #include <cmpi/CmpiObjectPath.h> +#include <cmpi/CmpiResult.h> #include <cmpiutil/base.h> -#include <zypp/base/LogTools.h> + #include <zypp/base/String.h> +#include <zypp/base/LogTools.h> #include <zypp/base/PtrTypes.h> -#include <cmpi/CmpiResult.h> - #include "SUSE_Common.h" #include "SUSE_zypp.h" @@ -19,6 +19,13 @@ std::ostream & operator<<( std::ostream & str, const CmpiObjectPath & obj ) return str; } +std::ostream & operator<<( std::ostream & str, const CmpiInstance & ci ) +{ + CmpiInstance lci( ci ); + str << lci.toString().charPtr(); + return str; +} + namespace cmpizypp { CmpiObjectPath get_this_computersystem(CmpiBroker & broker, const CmpiContext& ctx, const CmpiObjectPath & cop) @@ -147,7 +154,8 @@ namespace cmpizypp const char * _RefSourceClass, const char * _RefTargetClass, int inst, - int associators ) + int associators, + const SUSE_AssocFilter &filter ) { CmpiInstance cis( broker.getInstance( ctx, cop, NULL ) ); // source instance @@ -181,7 +189,8 @@ namespace cmpizypp while (en.hasNext() ) { CmpiInstance ci = en.getNext(); - rslt.returnData( ci ); + if( filter.filterInstance(ci, true) ) + rslt.returnData( ci ); } } else @@ -213,12 +222,14 @@ namespace cmpizypp /* associators = 0 && inst = 0 */ CmpiObjectPath tmp = ci.getObjectPath(); tmp.setNameSpace(cop.getNameSpace()); - rslt.returnData(tmp); + if( filter.filterObjectPath(tmp, false) ) + rslt.returnData(tmp); } else { /* associators = 0 && inst = 1 */ - rslt.returnData(ci); + if( filter.filterInstance(ci, false) ) + rslt.returnData(ci); } } else if(inst == 0) @@ -227,7 +238,8 @@ namespace cmpizypp //rslt.returnData(data); CmpiObjectPath tmp = (CmpiObjectPath)data; tmp.setNameSpace(cop.getNameSpace()); - rslt.returnData(tmp); + if( filter.filterObjectPath(tmp, true) ) + rslt.returnData(tmp); } } } @@ -244,12 +256,13 @@ namespace cmpizypp const char * _RefSourceClass, const char * _RefTargetClass, int inst, - int associators ) + int associators, + const SUSE_AssocFilter &filter ) { _CMPIZYPP_TRACE(1,("--- assoc_create_refs_1toN_ST called")); if ( _assoc_create_refs_1toN_ST( broker, ctx, rslt, cop, _ClassName, _RefSource, _RefTarget, _RefSourceClass, _RefTargetClass, - inst, associators ) ) + inst, associators, filter ) ) { _CMPIZYPP_TRACE(1,("--- assoc_create_refs_1toN_ST exited")); return true; @@ -285,7 +298,8 @@ namespace cmpizypp const char * _RefLeftClass, const char * _RefRightClass, int inst, - int associators ) + int associators, + const SUSE_AssocFilter &filter ) { _CMPIZYPP_TRACE(1,("--- assoc_create_refs_1toN called")); bool result = false; @@ -293,13 +307,13 @@ namespace cmpizypp { result = _assoc_create_refs_1toN_ST(broker, ctx, rslt, cop, _ClassName, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, - inst, associators); + inst, associators, filter); } else { result = _assoc_create_refs_1toN_ST(broker, ctx, rslt, cop, _ClassName, _RefRight, _RefLeft, _RefRightClass, _RefLeftClass, - inst, associators); + inst, associators, filter); } if ( result ) @@ -406,7 +420,8 @@ namespace cmpizypp const char * _RefLeftClass, const char * _RefRightClass, int left, - int inst) + int inst, + const SUSE_AssocFilter &filter ) { _CMPIZYPP_TRACE(1,("--- _assoc_create_inst_1toN called")); bool ret = false; @@ -445,7 +460,7 @@ namespace cmpizypp CmpiData data = en.getNext(); ret = assoc_create_refs_1toN( broker, ctx, rslt, data, _ClassName,_RefLeft,_RefRight, - _RefLeftClass,_RefRightClass,inst,0); + _RefLeftClass,_RefRightClass,inst,0, filter); } _CMPIZYPP_TRACE(1,("--- _assoc_create_inst_1toN exited")); return ret; @@ -461,11 +476,12 @@ namespace cmpizypp const char * _RefLeftClass, const char * _RefRightClass, int left, - int inst) + int inst, + const SUSE_AssocFilter &filter) { _CMPIZYPP_TRACE(1,("--- _assoc_create_inst_1toN called")); if ( _assoc_create_inst_1toN(broker, ctx, rslt, cop, - _ClassName, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, left, inst) ) + _ClassName, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, left, inst, filter) ) { _CMPIZYPP_TRACE(1,("--- _assoc_create_inst_1toN exited: successful")); return true; @@ -534,4 +550,5 @@ namespace cmpizypp _CMPIZYPP_TRACE(1,("--- assoc_get_inst exited")); return ci; } -} + +} // end namespace cmpizypp diff --git a/src/SUSE_Common.h b/src/SUSE_Common.h index 73b5ea7..3a0bd97 100644 --- a/src/SUSE_Common.h +++ b/src/SUSE_Common.h @@ -2,11 +2,13 @@ #define SUSE_COMMON_H #include <iosfwd> +#include "SUSE_AssocFilter.h" using std::endl; class CmpiObjectPath; std::ostream & operator<<( std::ostream & str, const CmpiObjectPath & obj ); +std::ostream & operator<<( std::ostream & str, const CmpiInstance & ci ); namespace cmpizypp { @@ -25,7 +27,8 @@ namespace cmpizypp const char * _RefSourceClass, const char * _RefTargetClass, int inst, - int associators ); + int associators, + const SUSE_AssocFilter &filter = SUSE_AssocFilter() ); /** Method to create CMPIInstance(s) / CMPIObjectPath(s) of association. * @@ -48,7 +51,8 @@ namespace cmpizypp const char * _RefLeftClass, const char * _RefRightClass, int inst, - int associators ); + int associators, + const SUSE_AssocFilter &filter = SUSE_AssocFilter() ); /** Method to check the input parameter resultClass, role and resultRole @@ -75,7 +79,8 @@ namespace cmpizypp const char * _RefLeftClass, const char * _RefRightClass, int left, - int inst); + int inst, + const SUSE_AssocFilter &filter = SUSE_AssocFilter() ); CmpiInstance assoc_get_inst( CmpiBroker & broker, const CmpiContext & ctx, @@ -83,5 +88,6 @@ namespace cmpizypp const char * _ClassName, const char * _RefLeft, const char * _RefRight); + } #endif // SUSE_COMMON_H \ No newline at end of file diff --git a/src/SUSE_HostedCollectionProvider.cc b/src/SUSE_HostedCollectionProvider.cc index 9a65c7f..670394a 100644 --- a/src/SUSE_HostedCollectionProvider.cc +++ b/src/SUSE_HostedCollectionProvider.cc @@ -50,7 +50,7 @@ namespace cmpizypp CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstanceNames failed." ); return st; } - + rslt.returnDone(); _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() exited",_ClassName)); return CmpiStatus(CMPI_RC_OK); @@ -69,7 +69,7 @@ namespace cmpizypp CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstances failed." ); return st; } - + rslt.returnDone(); _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() exited",_ClassName)); return CmpiStatus(CMPI_RC_OK); @@ -103,8 +103,9 @@ namespace cmpizypp if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, resultClass, role, resultRole ) ) { + SUSE_HostedCollectionFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -131,8 +132,9 @@ namespace cmpizypp if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, resultClass, role, resultRole ) ) { + SUSE_HostedCollectionFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -159,8 +161,9 @@ namespace cmpizypp if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) { + SUSE_HostedCollectionFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -186,8 +189,9 @@ namespace cmpizypp if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) { + SUSE_HostedCollectionFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -201,6 +205,90 @@ namespace cmpizypp return CmpiStatus(CMPI_RC_OK); } +/* -------------------------------------------------------------------------- */ + + SUSE_HostedCollectionFilter::SUSE_HostedCollectionFilter(const CmpiObjectPath &op) + : SUSE_AssocFilter() + , csop(op) + { } + + bool SUSE_HostedCollectionFilter::filterInstance(const CmpiInstance &ci, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance called")); + USR << ci << endl; + CmpiString CSName = csop.getKey("CreationClassName"); + CmpiString Name = csop.getKey("Name"); + + const char *filterCSName = ""; + const char *filterName = ""; + if( ! associators ) + { + CmpiObjectPath filterop = ci.getProperty( _RefLeft ); + filterCSName = filterop.getKey("CreationClassName"); + filterName = filterop.getKey("Name"); + } + else + { + CmpiInstance lci( ci ); + if( lci.instanceIsA( _RefLeftClass ) ) + { + _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance exited: true")); + return true; + } + + filterCSName = ci.getProperty("CreationClassName"); + filterName = ci.getProperty("Name"); + } + + if(CSName.equals(filterCSName) && Name.equals(filterName) ) + { + _CMPIZYPP_TRACE(1,("--- SUSE_HostedCollectionFilter::filterInstance exited: true")); + return true; + } + else + { + _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 CMProviderBase( SUSE_HostedCollectionProvider ); diff --git a/src/SUSE_HostedCollectionProvider.h b/src/SUSE_HostedCollectionProvider.h index 6d9892f..9b8b7cb 100644 --- a/src/SUSE_HostedCollectionProvider.h +++ b/src/SUSE_HostedCollectionProvider.h @@ -4,6 +4,8 @@ #include <cmpi/CmpiInstanceMI.h> #include <cmpi/CmpiAssociationMI.h> +#include "SUSE_AssocFilter.h" + namespace cmpizypp { /** @@ -37,6 +39,20 @@ namespace cmpizypp const CmpiObjectPath& cop, const char* resultClass, const char* role); }; + + class SUSE_HostedCollectionFilter: public SUSE_AssocFilter + { + private: + CmpiObjectPath csop; + + public: + 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; + }; + } // namespace cmpizypp #endif // SUSE_HOSTEDCOLLECTIONPROVIDERCLASS_H diff --git a/src/SUSE_InstalledSoftwareIdentityProvider.cc b/src/SUSE_InstalledSoftwareIdentityProvider.cc index bd2d30c..c90a875 100644 --- a/src/SUSE_InstalledSoftwareIdentityProvider.cc +++ b/src/SUSE_InstalledSoftwareIdentityProvider.cc @@ -157,8 +157,9 @@ namespace cmpizypp { if ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity { + SUSE_InstalledSoftwareIdentityFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -222,8 +223,9 @@ namespace cmpizypp { if ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity { + SUSE_InstalledSoftwareIdentityFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1, filter) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -293,8 +295,9 @@ namespace cmpizypp { if ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity { + SUSE_InstalledSoftwareIdentityFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -368,8 +371,9 @@ namespace cmpizypp { if ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity { + SUSE_InstalledSoftwareIdentityFilter filter(get_this_computersystem(*broker, ctx, cop)); if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, - _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0) ) + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0, filter ) ) { CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); @@ -432,6 +436,77 @@ namespace cmpizypp return CmpiStatus(CMPI_RC_OK); } + + SUSE_InstalledSoftwareIdentityFilter::SUSE_InstalledSoftwareIdentityFilter(const CmpiObjectPath &op) + : SUSE_AssocFilter() + , csop(op) + { } + + bool SUSE_InstalledSoftwareIdentityFilter::filterInstance(const CmpiInstance &ci, bool associators) const + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance called")); + USR << ci << endl; + CmpiString CSName = csop.getKey("CreationClassName"); + CmpiString Name = csop.getKey("Name"); + + const char *filterCSName = ""; + const char *filterName = ""; + if( ! associators ) + { + CmpiObjectPath filterop = ci.getProperty( _RefRight ); + filterCSName = filterop.getKey("CreationClassName"); + filterName = filterop.getKey("Name"); + } + else + { + filterCSName = ci.getProperty("CreationClassName"); + filterName = ci.getProperty("Name"); + } + + if(CSName.equals(filterCSName) && Name.equals(filterName) ) + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance exited: true")); + return true; + } + else + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterInstance 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 ) + { + filterop = op.getKey( _RefRight ); + } + else + { + filterop = op; + } + CmpiString filterCSName = filterop.getKey("CreationClassName"); + CmpiString filterName = filterop.getKey("Name"); + + if(filterCSName.equals(CSName) && filterName.equals(Name) ) + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterObjectPath exited: true")); + return true; + } + else + { + _CMPIZYPP_TRACE(1,("--- SUSE_InstalledSoftwareIdentityFilter::filterObjectPath exited: false")); + return false; + } + } + + } // namespace cmpizypp CMProviderBase( SUSE_InstalledSoftwareIdentityProvider ); diff --git a/src/SUSE_InstalledSoftwareIdentityProvider.h b/src/SUSE_InstalledSoftwareIdentityProvider.h index adb7f3d..ceee8e8 100644 --- a/src/SUSE_InstalledSoftwareIdentityProvider.h +++ b/src/SUSE_InstalledSoftwareIdentityProvider.h @@ -4,6 +4,8 @@ #include <cmpi/CmpiInstanceMI.h> #include <cmpi/CmpiAssociationMI.h> +#include "SUSE_AssocFilter.h" + namespace cmpizypp { /** @@ -37,6 +39,19 @@ namespace cmpizypp const CmpiObjectPath& cop, const char* resultClass, const char* role); }; + class SUSE_InstalledSoftwareIdentityFilter: public SUSE_AssocFilter + { + private: + CmpiObjectPath csop; + + public: + 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; + }; + } // namespace cmpizypp #endif // SUSE_INSTALLEDSOFTWAREIDENTITYPROVIDERCLASS_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] <cmpi-zypp> define all namespaces in the log macro
by Michael Calmer 27 Jan '09

27 Jan '09

commit 1de4afed4cfe8f829716b77d9e20a1cd8a2c622e Author: Michael Calmer <mc(a)suse.de> Date: Tue Jan 27 15:36:08 2009 +0100 define all namespaces in the log macro --- src/SUSE_zypp.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/SUSE_zypp.h b/src/SUSE_zypp.h index 69695b0..6f84e4b 100644 --- a/src/SUSE_zypp.h +++ b/src/SUSE_zypp.h @@ -10,7 +10,7 @@ #include "zypp/Target.h" #include "zypp/ResPool.h" -#define _CMPIZYPP_TRACE( LV, FORMAT ) USR << "[" << LV << "] " << str::form FORMAT << endl; +#define _CMPIZYPP_TRACE( LV, FORMAT ) USR << "[" << LV << "] " << zypp::str::form FORMAT << std::endl; 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] <zypper> changes
by Ján Kupec 27 Jan '09

27 Jan '09

commit 9aaecf229cdc189674fd7c0ea0f779a91ef04969 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 14:28:02 2009 +0100 changes --- VERSION.cmake | 4 ++-- package/zypper.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 786273b..2cc23bc 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") -# LAST RELEASED: 1.0.5 +# LAST RELEASED: 1.0.6 #======= diff --git a/package/zypper.changes b/package/zypper.changes index b61d254..59cab89 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 27 14:26:27 CET 2009 - jkupec(a)suse.cz + +- Adapted authetication callback for non-curl URLs (bnc #460970) +- 1.0.6 + +------------------------------------------------------------------- Fri Jan 23 16:46:51 CET 2009 - jkupec(a)suse.cz - translations update -- 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 44813a5c751e9e0b307058645cf9efd101d9fa00 Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 14:15:34 2009 +0100 changes --- package/libzypp.changes | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/package/libzypp.changes b/package/libzypp.changes index 91fc3b3..5c64ea2 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jan 27 14:09:52 CET 2009 - jkupec(a)suse.cz + +- Enabled CredentialManager for MediaSMB (bnc #460970). +- Ignore URL's username, password, and query string in AuthData + comparator in CredentialManager. + +------------------------------------------------------------------- Mon Jan 26 17:56:40 CET 2009 - schubi(a)suse.de - Taking ALL translations for generating GMO files (bnc #458739) -- 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] <zypper> Adapted authetication callback for non-curl URLs (bnc #460970)
by Ján Kupec 27 Jan '09

27 Jan '09

commit 25678627017ea2f943c430374d66f9d1026639bf Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 14:02:39 2009 +0100 Adapted authetication callback for non-curl URLs (bnc #460970) --- src/callbacks/media.h | 81 ++++++++++++++++++++++++------------------------- 1 files changed, 40 insertions(+), 41 deletions(-) diff --git a/src/callbacks/media.h b/src/callbacks/media.h index 9a463d0..0cd9b6e 100644 --- a/src/callbacks/media.h +++ b/src/callbacks/media.h @@ -64,7 +64,7 @@ namespace ZmartRecipients const std::vector<std::string> & devices, unsigned int & index) { - /*std::cout << "detected devices: "; + /*std::cout << "detected devices: "; for (std::vector<std::string>::const_iterator it = devices.begin(); it != devices.end(); ++it) std::cout << *it << " "; @@ -75,7 +75,7 @@ namespace ZmartRecipients if (is_changeable_media(url) && error == MediaChangeReport::WRONG) { //cerr << endl; // may be in the middle of RepoReport or ProgressReport \todo check this - + std::string request = boost::str(boost::format( // TranslatorExplanation translate letters 'y' and 'n' to whathever is appropriate for your language. // Try to check what answers does zypper accept (it always accepts y/n at least) @@ -84,7 +84,7 @@ namespace ZmartRecipients _("Please insert medium [%s] #%d and type 'y' to continue or 'n' to cancel the operation.")) % label % mediumNr); if (read_bool_answer(PROMPT_YN_MEDIA_CHANGE, request, false)) - return MediaChangeReport::RETRY; + return MediaChangeReport::RETRY; else return MediaChangeReport::ABORT; } @@ -131,7 +131,7 @@ namespace ZmartRecipients if (out.verbosity() < Out::HIGH && ( - // don't show download info unless show_media_progress_hack is used + // don't show download info unless show_media_progress_hack is used !Zypper::instance()->runtimeData().show_media_progress_hack || // don't report download of the media file (bnc #330614) zypp::Pathname(uri.getPathName()).basename() == "media" @@ -213,49 +213,48 @@ namespace ZmartRecipients } // curl authentication - zypp::media::CurlAuthData * auth_data_ptr = + zypp::media::CurlAuthData * curl_auth_data = dynamic_cast<zypp::media::CurlAuthData*> (&auth_data); - if (auth_data_ptr) - { - - // user name - - std::string username; - // expect the input from machine on stdin - if (Zypper::instance()->globalOpts().machine_readable) - { - Zypper::instance()->out().prompt( - PROMPT_AUTH_USERNAME, _("User Name"), PromptOptions(), description); - std::cin >> username; - } - // input from human using readline - else - { - std::cout << description << std::endl; - username = get_text(_("User Name") + std::string(": "), auth_data.username()); - } - auth_data_ptr->setUsername(username); - // password - + if (curl_auth_data) + curl_auth_data->setAuthType("basic,digest"); + + // user name + + std::string username; + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + { Zypper::instance()->out().prompt( - PROMPT_AUTH_PASSWORD, _("Password"), PromptOptions()); + PROMPT_AUTH_USERNAME, _("User Name"), PromptOptions(), description); + std::cin >> username; + } + // input from human using readline + else + { + std::cout << description << std::endl; + username = get_text(_("User Name") + std::string(": "), auth_data.username()); + } + if (username.empty()) + return false; + auth_data.setUsername(username); - std::string password; - // expect the input from machine on stdin - if (Zypper::instance()->globalOpts().machine_readable) - std::cin >> password; - else - password = get_password(); - if (password.empty()) return false; - auth_data_ptr->setPassword(password); + // password - auth_data_ptr->setAuthType("basic,digest"); + Zypper::instance()->out().prompt( + PROMPT_AUTH_PASSWORD, _("Password"), PromptOptions()); - return true; - } + std::string password; + // expect the input from machine on stdin + if (Zypper::instance()->globalOpts().machine_readable) + std::cin >> password; + else + password = get_password(); + if (password.empty()) + return false; + auth_data.setPassword(password); - return false; + return true; } }; @@ -286,7 +285,7 @@ class MediaCallbacks { } }; -#endif +#endif // Local Variables: // mode: c++ // c-basic-offset: 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] <zypper> changes
by Ján Kupec 27 Jan '09

27 Jan '09

commit 14946eb7d25d96536b9c2df4f100cf6e7d49641f Author: Ján Kupec <jkupec(a)suse.cz> Date: Tue Jan 27 14:08:16 2009 +0100 changes --- package/zypper.changes | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index d292a38..39863a9 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 27 14:06:56 CET 2009 - jkupec(a)suse.cz + +- Adapted authetication callback for non-curl URLs (bnc #460970) + +------------------------------------------------------------------- Thu Jan 15 11:18:36 CET 2009 - jkupec(a)suse.cz - fixed typo (bnc #447594) -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0