January 2009 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] <sat-solver> - add changes, bump version
by Michael Schroeder 31 Jan '09

31 Jan '09

ref: refs/heads/master commit 1c3c2ffaa4cef36a477ae222014f95e711dbf414 Author: Michael Schroeder <mls(a)suse.de> Date: Sat Jan 31 14:13:46 2009 +0100 - add changes, bump version --- VERSION.cmake | 4 ++-- package/libsatsolver.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index 0c42ad2..2cd69e3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "13") -SET(LIBSATSOLVER_PATCH "1") +SET(LIBSATSOLVER_PATCH "3") -# last released 0.13.0 +# last released 0.13.1 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 53ba504..7cb1933 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 30 14:26:42 CET 2009 - mls(a)suse.de + +- fix weakmap boundary check +- 0.13.3 + +------------------------------------------------------------------- Tue Jan 27 13:12:30 CET 2009 - ma(a)suse.de - Ignore trailing whitespace in content file parser. -- 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> master : Implement SUSE_SoftwareInstallationServiceCapabilities
by Michael Calmer 30 Jan '09

30 Jan '09

ref: refs/heads/master commit 1e5e0bdadb5e7b1fb84ca156c23abccbc06289fe Author: Michael Calmer <mc(a)suse.de> Date: Fri Jan 30 17:08:46 2009 +0100 Implement SUSE_SoftwareInstallationServiceCapabilities --- mof/CMakeLists.txt | 2 + ...USE_SoftwareInstallationServiceCapabilities.mof | 23 ++++ ...oftwareInstallationServiceCapabilities.sfcb.reg | 5 + mof/deploy.mof | 1 + src/CMakeLists.txt | 2 + ...twareInstallationServiceCapabilitiesProvider.cc | 137 ++++++++++++++++++++ ...ftwareInstallationServiceCapabilitiesProvider.h | 25 ++++ 7 files changed, 195 insertions(+), 0 deletions(-) diff --git a/mof/CMakeLists.txt b/mof/CMakeLists.txt index 29d62a8..2343679 100644 --- a/mof/CMakeLists.txt +++ b/mof/CMakeLists.txt @@ -14,6 +14,8 @@ INSTALL( FILES SUSE_SoftwareInstallationService.sfcb.reg SUSE_InstallationServiceAffectsSoftwareIdentity.mof SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg + SUSE_SoftwareInstallationServiceCapabilities.mof + SUSE_SoftwareInstallationServiceCapabilities.sfcb.reg deploy.mof DESTINATION ${CMPIZYPP_DATA_DIR}/ ) diff --git a/mof/SUSE_SoftwareInstallationServiceCapabilities.mof b/mof/SUSE_SoftwareInstallationServiceCapabilities.mof new file mode 100644 index 0000000..2054df3 --- /dev/null +++ b/mof/SUSE_SoftwareInstallationServiceCapabilities.mof @@ -0,0 +1,23 @@ +//#pragma namespace ("root/cimv2") + + +// ------------------------------------------------------------------- +// ******************************************************************* +// Classes +// ******************************************************************* +// ------------------------------------------------------------------- + + + +// =================================================================== +// SUSE_SoftwareInstallationServiceCapabilities +// =================================================================== + +[ Provider("cmpi:cmpi-zypp"), + Description ("A Class which provide SoftwareInstallationServiceCapabilities.") +] +class SUSE_SoftwareInstallationServiceCapabilities : CIM_SoftwareInstallationServiceCapabilities +{ +}; + + diff --git a/mof/SUSE_SoftwareInstallationServiceCapabilities.sfcb.reg b/mof/SUSE_SoftwareInstallationServiceCapabilities.sfcb.reg new file mode 100644 index 0000000..3860ee8 --- /dev/null +++ b/mof/SUSE_SoftwareInstallationServiceCapabilities.sfcb.reg @@ -0,0 +1,5 @@ +[SUSE_SoftwareInstallationServiceCapabilities] + provider: SUSE_SoftwareInstallationServiceCapabilitiesProvider + location: cmpi-zypp + type: instance + namespace: root/cimv2 diff --git a/mof/deploy.mof b/mof/deploy.mof index f30958b..0773b35 100644 --- a/mof/deploy.mof +++ b/mof/deploy.mof @@ -6,4 +6,5 @@ #pragma include ("SUSE_HostedCollection.mof") #pragma include ("SUSE_SoftwareInstallationService.mof") #pragma include ("SUSE_InstallationServiceAffectsSoftwareIdentity.mof") +#pragma include ("SUSE_SoftwareInstallationServiceCapabilities.mof") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 876a072..7f99497 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,6 +16,7 @@ SET( CMPIZYPP_SRCS SUSE_HostedCollectionProvider.cc SUSE_SoftwareInstallationServiceProvider.cc SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc + SUSE_SoftwareInstallationServiceCapabilitiesProvider.cc ) SET( CMPIZYPP_HEADERS SUSE_Common.h @@ -28,6 +29,7 @@ SET( CMPIZYPP_HEADERS SUSE_AssocFilter.h SUSE_SoftwareInstallationServiceProvider.h SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h + SUSE_SoftwareInstallationServiceCapabilitiesProvider.h ) ADD_LIBRARY(cmpi-zypp SHARED ${CMPIZYPP_SRCS}) diff --git a/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.cc b/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.cc new file mode 100644 index 0000000..b44b576 --- /dev/null +++ b/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.cc @@ -0,0 +1,137 @@ + +#include <iostream> + +#include <cmpi/cmpimacs.h> +#include <cmpi/cmpidt.h> +#include <cmpi/CmpiResult.h> +#include <cmpi/CmpiBroker.h> +#include <cmpi/CmpiArray.h> +#include <cmpi/CmpiBooleanData.h> + +#include <zypp/base/String.h> +#include <zypp/base/LogTools.h> + +#include "SUSE_zypp.h" +#include "SUSE_Common.h" +#include "SUSE_SoftwareInstallationServiceCapabilitiesProvider.h" + +using namespace zypp; +using std::endl; + +namespace cmpizypp +{ + namespace + { + const char * _ClassName = "SUSE_SoftwareInstallationServiceCapabilities"; + const char * _InstanceID = "SUSE:ZYPP_CAPS"; + } // namespace + + +SUSE_SoftwareInstallationServiceCapabilitiesProviderClass::SUSE_SoftwareInstallationServiceCapabilitiesProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ) + : CmpiBaseMI( mbp, ctx ) + , CmpiInstanceMI( mbp, ctx ) +{ +} + +CmpiStatus SUSE_SoftwareInstallationServiceCapabilitiesProviderClass::enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + op.setKey( "InstanceID", _InstanceID ); + rslt.returnData( op ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + +CmpiStatus SUSE_SoftwareInstallationServiceCapabilitiesProviderClass::enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() called",_ClassName)); + + rslt.returnData( makeInstance( cop, properties ) ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + + +CmpiStatus SUSE_SoftwareInstallationServiceCapabilitiesProviderClass::getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() called",_ClassName)); + + const char *id = cop.getKey("InstanceID"); + + if( id == NULL || ::strcmp( id, _InstanceID ) != 0 ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, "Could not find this instance." ); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() failed : %s", _ClassName, rc.msg())); + return rc; + } + + rslt.returnData( makeInstance( cop, properties ) ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + +CmpiInstance SUSE_SoftwareInstallationServiceCapabilitiesProviderClass::makeInstance( const CmpiObjectPath & cop, const char ** properties ) +{ + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + CmpiInstance ci( op ); + + const char * keys[] = { "InstanceID" }; + ci.setPropertyFilter( properties, keys ); + + ci.setProperty( "InstanceID", _InstanceID ); + + unsigned size = 3; + CmpiArray opts( size, CMPI_uint16 ); + opts[0] = CMPIUint16(3); // Force installation + opts[1] = CMPIUint16(4); // Install + opts[2] = CMPIUint16(5); // Update + //opts[3] = CMPIUint16(); + ci.setProperty( "SupportedInstallOptions", opts ); + ci.setProperty( "CanAddToCollection", CmpiFalse ); + + size = 1; + CmpiArray types( size, CMPI_uint16 ); + types[0] = CMPIUint16(3); // Linux RPM + ci.setProperty( "SupportedExtendedResourceTypes", types ); + + CmpiArray typesmajv( size, CMPI_uint16 ); + typesmajv[0] = CMPIUint16(4); // RPM Major version + ci.setProperty( "SupportedExtendedResourceTypesMajorVersions", typesmajv ); + + CmpiArray typesminv( size, CMPI_uint16 ); + typesminv[0] = CMPIUint16(4); // RPM Major version + ci.setProperty( "SupportedExtendedResourceTypesMinorVersions", typesminv ); + + CmpiArray typesrevn( size, CMPI_uint16 ); + typesrevn[0] = CMPIUint16(2); // RPM Revision Number + ci.setProperty( "SupportedExtendedResourceTypesRevisionNumbers", typesrevn ); + + CmpiArray typesbn( size, CMPI_uint16 ); + typesbn[0] = CMPIUint16(0); // RPM Major version + ci.setProperty( "SupportedExtendedResourceTypesBuildNumbers", typesbn ); + + CmpiArray instsync( size, CMPI_uint16 ); + instsync[0] = CMPIUint16(3); // Install From Software Identity + ci.setProperty( "SupportedSynchronousActions", instsync ); + + CmpiArray instasync( size, CMPI_uint16 ); + instasync[0] = CMPIUint16(2); // None supported + ci.setProperty( "SupportedAsynchronousActions", instasync ); + + + return ci; +} + +} // namespace cmpizypp + +CMProviderBase( SUSE_SoftwareInstallationServiceCapabilitiesProvider ); + +CMInstanceMIFactory( cmpizypp::SUSE_SoftwareInstallationServiceCapabilitiesProviderClass, SUSE_SoftwareInstallationServiceCapabilitiesProvider ); diff --git a/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.h b/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.h new file mode 100644 index 0000000..c9a884e --- /dev/null +++ b/src/SUSE_SoftwareInstallationServiceCapabilitiesProvider.h @@ -0,0 +1,25 @@ +#ifndef SUSE_SOFTWAREINSTALLATIONSERVICECAPABILITIESPROVIDER_H +#define SUSE_SOFTWAREINSTALLATIONSERVICECAPABILITIESPROVIDER_H + +#include <cmpi/CmpiInstanceMI.h> + +namespace cmpizypp +{ + /** + */ + class SUSE_SoftwareInstallationServiceCapabilitiesProviderClass : public CmpiInstanceMI + { + public: + SUSE_SoftwareInstallationServiceCapabilitiesProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ); + + virtual CmpiStatus enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ); + virtual CmpiStatus enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ); + virtual CmpiStatus getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ); + + private: + CmpiInstance makeInstance( const CmpiObjectPath & cop, const char ** properties ); + }; + +} // namespace cmpizypp + +#endif // SUSE_SOFTWAREINSTALLATIONSERVICECAPABILITIESPROVIDER_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> master : Implement SUSE_InstallationServiceAffectsSoftware (part 2)
by Michael Calmer 30 Jan '09

30 Jan '09

ref: refs/heads/master commit 8ddc1ecd39b73641406991fac40a6314ed89445c Author: Michael Calmer <mc(a)suse.de> Date: Fri Jan 30 16:09:10 2009 +0100 Implement SUSE_InstallationServiceAffectsSoftware (part 2) --- ..._InstallationServiceAffectsSoftwareIdentity.mof | 30 ++ ...allationServiceAffectsSoftwareIdentity.sfcb.reg | 5 + ...lationServiceAffectsSoftwareIdentityProvider.cc | 485 ++++++++++++++++++++ ...llationServiceAffectsSoftwareIdentityProvider.h | 42 ++ 4 files changed, 562 insertions(+), 0 deletions(-) diff --git a/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.mof b/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.mof new file mode 100644 index 0000000..b5465a5 --- /dev/null +++ b/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.mof @@ -0,0 +1,30 @@ +//#pragma namespace ("root/cimv2") + + +// ------------------------------------------------------------------- +// ******************************************************************* +// Classes +// ******************************************************************* +// ------------------------------------------------------------------- + + + +// =================================================================== +// SUSE_InstallationServiceAffectsSoftwareIdentity +// =================================================================== + +[ Provider("cmpi:cmpi-zypp"), + Description ("Association between SUSE_SoftwareInstallationService and SUSE_SoftwareIdentity") +] +class SUSE_InstallationServiceAffectsSoftwareIdentity : CIM_ServiceAffectsElement +{ + [Override ( "AffectedElement" ), + Description ( "Overwrite a CIM_ManagedElement." )] + SUSE_SoftwareIdentity REF AffectedElement; + + [Override ( "AffectingElement" ), + Description ( "Overwrite a CIM_Service." )] + SUSE_SoftwareInstallationService REF AffectingElement; +}; + + diff --git a/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg b/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg new file mode 100644 index 0000000..3bb64dd --- /dev/null +++ b/mof/SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg @@ -0,0 +1,5 @@ +[SUSE_InstallationServiceAffectsSoftwareIdentity] + provider: SUSE_InstallationServiceAffectsSoftwareIdentityProvider + location: cmpi-zypp + type: instance association + namespace: root/cimv2 diff --git a/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc b/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc new file mode 100644 index 0000000..181830b --- /dev/null +++ b/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc @@ -0,0 +1,485 @@ + +#include <iostream> + +#include <cmpi/cmpimacs.h> +#include <cmpi/cmpidt.h> +#include <cmpi/CmpiResult.h> +#include <cmpi/CmpiBroker.h> +#include <cmpi/CmpiArray.h> +#include <cmpi/CmpiBooleanData.h> + +#include <zypp/base/String.h> +#include <zypp/base/LogTools.h> + +#include "SUSE_zypp.h" +#include "SUSE_Common.h" +#include "SUSE_SoftwareIdentityProvider.h" +#include "SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h" + +using namespace zypp; +using std::endl; + +namespace cmpizypp +{ + namespace + { + const char * _ClassName = "SUSE_InstallationServiceAffectsSoftwareIdentity"; + const char * _RefLeft = "AffectedElement"; + const char * _RefRight = "AffectingElement"; + const char * _RefLeftClass = "SUSE_SoftwareIdentity"; + const char * _RefRightClass = "SUSE_SoftwareInstallationService"; + + } // namespace + + SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ) + : CmpiBaseMI( mbp, ctx ) + , CmpiInstanceMI( mbp, ctx ) + , CmpiAssociationMI( mbp, ctx ) + { + } + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() called",_ClassName)); + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() failed : %s", _ClassName, rc.msg())); + return rc; + } + + CmpiObjectPath op(cop.getNameSpace(), _RefRightClass); // SUSE_SoftwareInstallationService + if( op.isNull() ) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "Create CMPIObjectPath failed."); + _CMPIZYPP_TRACE(1,("--- enumInstanceNames() failed: %s", st.msg() ) ); + return st; + } + CmpiEnumeration en = broker->enumInstanceNames( ctx, op ); + if( en.isNull() ) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstanceNames failed."); + _CMPIZYPP_TRACE(1,("--- enumInstanceNames() failed: %s", st.msg() ) ); + return st; + } + + CmpiObjectPath rop( cop.getNameSpace(), _ClassName ); + + while( en.hasNext() ) + { + CmpiData data = en.getNext(); + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiObjectPath iop = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityOP(*it, *zyppac, cop); + CmpiInstance ci( rop ); + if( ci.isNull() ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create CmpiInstance failed."); + } + ci.setProperty( _RefRight, iop ); + ci.setProperty( _RefLeft, data ); + + CmpiObjectPath tmp = ci.getObjectPath(); + tmp.setNameSpace(cop.getNameSpace()); + rslt.returnData(tmp); + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() called",_ClassName)); + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() failed : %s", _ClassName, rc.msg())); + return rc; + } + + CmpiObjectPath op(cop.getNameSpace(), _RefRightClass); // SUSE_SoftwareInstallationService + if( op.isNull() ) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "Create CMPIObjectPath failed."); + _CMPIZYPP_TRACE(1,("--- enumInstances() failed: %s", st.msg() ) ); + return st; + } + CmpiEnumeration en = broker->enumInstanceNames( ctx, op ); + if( en.isNull() ) + { + CmpiStatus st( CMPI_RC_ERR_FAILED, "EnumInstanceNames failed."); + _CMPIZYPP_TRACE(1,("--- enumInstances() failed: %s", st.msg() ) ); + return st; + } + + CmpiObjectPath rop( cop.getNameSpace(), _ClassName ); + + while( en.hasNext() ) + { + CmpiData data = en.getNext(); + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiObjectPath iop = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityOP(*it, *zyppac, cop); + CmpiInstance ci( rop ); + if( ci.isNull() ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create CmpiInstance failed."); + } + ci.setProperty( _RefRight, iop ); + ci.setProperty( _RefLeft, data ); + + rslt.returnData(ci); + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() called",_ClassName)); + + CmpiInstance ci = assoc_get_inst( *broker, ctx, cop, _ClassName, _RefLeft, _RefRight); + + rslt.returnData( ci ); + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::associators( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI associators() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !assocClass || op.classPathIsA( assocClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + resultClass, role, resultRole ) ) + { + if ( cop.classPathIsA(_RefRightClass) ) // SUSE_SoftwareInstallationService + { + // we need to implement our own handling, + // because we need to search for SUSE_SoftwareIdentity + CmpiInstance cis( broker->getInstance( ctx, cop, NULL ) ); // source instance + + if( !cis.instanceIsA(_RefRightClass) ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create references failed."); + } + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI associators() failed : %s", _ClassName, rc.msg())); + return rc; + } + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiInstance ci = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityInstance(*it, *zyppac, cop, properties); + rslt.returnData(ci); + } + } + else // ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity + { + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 1) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create associations failed."); + _CMPIZYPP_TRACE(1,("--- CMPI associators() failed.")); + return st; + } + } + } + + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI associators() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::associatorNames( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI associatorNames() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !assocClass || op.classPathIsA( assocClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + resultClass, role, resultRole ) ) + { + if ( cop.classPathIsA(_RefRightClass) ) // SUSE_SoftwareInstallationService + { + // we need to implement our own handling, + // because we need to search for SUSE_SoftwareIdentity + CmpiInstance cis( broker->getInstance( ctx, cop, NULL ) ); // source instance + + if( !cis.instanceIsA(_RefRightClass) ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create instance failed."); + } + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI associatorNames() failed : %s", _ClassName, rc.msg())); + return rc; + } + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiObjectPath iop = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityOP(*it, *zyppac, cop); + + rslt.returnData(iop); + } + } + else // ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity + { + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 1) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI associatorNames() failed.")); + return st; + } + } + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI associatorNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::references( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role, + const char** properties ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI references() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !resultClass || op.classPathIsA( resultClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) + { + if ( cop.classPathIsA(_RefRightClass) ) // SUSE_SoftwareInstallationService + { + // we need to implement our own handling, + // because we need to search for SUSE_SoftwareIdentity + CmpiInstance cis( broker->getInstance( ctx, cop, NULL ) ); // source instance + + if( !cis.instanceIsA(_RefLeftClass) ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create references failed."); + } + + CmpiObjectPath rop( cop.getNameSpace(), _ClassName ); // associations op + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI references() failed : %s", _ClassName, rc.msg())); + return rc; + } + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiObjectPath iop = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityOP(*it, *zyppac, cop); + CmpiInstance ci( rop ); + if( ci.isNull() ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create CmpiInstance failed."); + } + ci.setProperty( _RefRight, iop ); + ci.setProperty( _RefLeft, cop ); + rslt.returnData(ci); + } + } + else //( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity + { + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 1, 0) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI references() failed.")); + return st; + } + } + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI references() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + + CmpiStatus SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass::referenceNames( const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role ) + { + _CMPIZYPP_TRACE(1,("--- %s CMPI referenceNames() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + + if ( !resultClass || op.classPathIsA( resultClass ) ) + { + if ( assoc_check_parameter_const( cop, _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, + NULL/*resultClass*/, role, NULL /*resultRole*/ ) ) + { + if ( cop.classPathIsA(_RefRightClass) ) // SUSE_SoftwareInstallationService + { + // we need to implement our own handling, + // because we need to search for SUSE_SoftwareIdentity + CmpiInstance cis( broker->getInstance( ctx, cop, NULL ) ); // source instance + + if( !cis.instanceIsA(_RefRightClass) ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create referenceNames failed."); + } + + CmpiObjectPath rop( cop.getNameSpace(), _ClassName ); // associations op + + // zypp init + zypp::scoped_ptr<ZyppAC> zyppac; + try + { + zyppac.reset( new ZyppAC() ); + } + catch ( const zypp::Exception & err ) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, ZyppAC::exceptionString( err, "Could not list software identities: " ).c_str() ); + _CMPIZYPP_TRACE(1,("--- %s CMPI referenceNames() failed : %s", _ClassName, rc.msg())); + return rc; + } + + ResPool pool( zyppac->pool() ); + for_( it, pool.begin(), pool.end() ) + { + if( (*it).status().isInstalled() ) + continue; + + CmpiObjectPath iop = SUSE_SoftwareIdentityProviderClass::makeSoftwareIdentityOP(*it, *zyppac, cop); + CmpiInstance ci( rop ); + if( ci.isNull() ) + { + return CmpiStatus(CMPI_RC_ERR_FAILED, "Create CmpiInstance failed."); + } + ci.setProperty( _RefRight, iop ); + ci.setProperty( _RefLeft, cop ); + + CmpiObjectPath tmp = ci.getObjectPath(); + tmp.setNameSpace(cop.getNameSpace()); + rslt.returnData(tmp); + } + } + else // ( cop.classPathIsA(_RefLeftClass) ) //SUSE_SoftwareIdentity + { + const char * copInstanceId = cop.getKey("InstanceId"); + if ( ! ZyppAC::isSystemSoftwareIdentityInstanceId( copInstanceId ) ) + { + if(! assoc_create_refs_1toN_ST( *broker, ctx, rslt, cop, _ClassName, + _RefLeft, _RefRight, _RefLeftClass, _RefRightClass, 0, 0) ) + { + CmpiStatus st(CMPI_RC_ERR_FAILED, "Create references failed."); + _CMPIZYPP_TRACE(1,("--- CMPI referenceNames() failed.")); + return st; + } + } + } + } + } + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI referenceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); + } + +} // namespace cmpizypp + +CMProviderBase( SUSE_InstallationServiceAffectsSoftwareIdentityProvider ); + +CMInstanceMIFactory( cmpizypp::SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass, SUSE_InstallationServiceAffectsSoftwareIdentityProvider ); +CMAssociationMIFactory( cmpizypp::SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass, SUSE_InstallationServiceAffectsSoftwareIdentityProvider ); diff --git a/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h b/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h new file mode 100644 index 0000000..511fb04 --- /dev/null +++ b/src/SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h @@ -0,0 +1,42 @@ +#ifndef SUSE_INSTALLATIONSERVICEAFFECTSSOFTWAREIDENTITYPROVIDERCLASS_H +#define SUSE_INSTALLATIONSERVICEAFFECTSSOFTWAREIDENTITYPROVIDERCLASS_H + +#include <cmpi/CmpiInstanceMI.h> +#include <cmpi/CmpiAssociationMI.h> + +namespace cmpizypp +{ + /** + */ + class SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass : public CmpiInstanceMI, public CmpiAssociationMI + { + public: + SUSE_InstallationServiceAffectsSoftwareIdentityProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ); + + virtual CmpiStatus enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ); + virtual CmpiStatus enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ); + virtual CmpiStatus getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ); + + virtual CmpiStatus associators + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole, const char** properties); + + virtual CmpiStatus associatorNames + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* assocClass, const char* resultClass, + const char* role, const char* resultRole); + + virtual CmpiStatus references + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role, + const char** properties); + + virtual CmpiStatus referenceNames + (const CmpiContext& ctx, CmpiResult& rslt, + const CmpiObjectPath& cop, const char* resultClass, const char* role); + }; + +} // namespace cmpizypp + +#endif // SUSE_INSTALLATIONSERVICEAFFECTSSOFTWAREIDENTITYPROVIDERCLASS_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> master : Implement SUSE_InstallationServiceAffectsSoftwareIdentity
by Michael Calmer 30 Jan '09

30 Jan '09

ref: refs/heads/master commit 49dcc0205f15a1afc65ffdbe3adf4c738967de4c Author: Michael Calmer <mc(a)suse.de> Date: Fri Jan 30 16:07:57 2009 +0100 Implement SUSE_InstallationServiceAffectsSoftwareIdentity --- mof/CMakeLists.txt | 2 ++ mof/deploy.mof | 1 + src/CMakeLists.txt | 2 ++ 3 files changed, 5 insertions(+), 0 deletions(-) diff --git a/mof/CMakeLists.txt b/mof/CMakeLists.txt index 920ae3d..29d62a8 100644 --- a/mof/CMakeLists.txt +++ b/mof/CMakeLists.txt @@ -12,6 +12,8 @@ INSTALL( FILES SUSE_HostedCollection.mof SUSE_SoftwareInstallationService.mof SUSE_SoftwareInstallationService.sfcb.reg + SUSE_InstallationServiceAffectsSoftwareIdentity.mof + SUSE_InstallationServiceAffectsSoftwareIdentity.sfcb.reg deploy.mof DESTINATION ${CMPIZYPP_DATA_DIR}/ ) diff --git a/mof/deploy.mof b/mof/deploy.mof index d6df3a7..f30958b 100644 --- a/mof/deploy.mof +++ b/mof/deploy.mof @@ -5,4 +5,5 @@ #pragma include ("SUSE_MemberOfCollection.mof") #pragma include ("SUSE_HostedCollection.mof") #pragma include ("SUSE_SoftwareInstallationService.mof") +#pragma include ("SUSE_InstallationServiceAffectsSoftwareIdentity.mof") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f25077f..876a072 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,6 +15,7 @@ SET( CMPIZYPP_SRCS SUSE_MemberOfCollectionProvider.cc SUSE_HostedCollectionProvider.cc SUSE_SoftwareInstallationServiceProvider.cc + SUSE_InstallationServiceAffectsSoftwareIdentityProvider.cc ) SET( CMPIZYPP_HEADERS SUSE_Common.h @@ -26,6 +27,7 @@ SET( CMPIZYPP_HEADERS SUSE_HostedCollectionProvider.h SUSE_AssocFilter.h SUSE_SoftwareInstallationServiceProvider.h + SUSE_InstallationServiceAffectsSoftwareIdentityProvider.h ) ADD_LIBRARY(cmpi-zypp SHARED ${CMPIZYPP_SRCS}) -- 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> - add changes, bump version
by Michael Schroeder 30 Jan '09

30 Jan '09

commit 1686a0449268031e9113cd4caaf772908d1faa66 Author: Michael Schroeder <mls(a)suse.de> Date: Fri Jan 30 14:28:40 2009 +0100 - add changes, bump version --- VERSION.cmake | 2 +- package/libsatsolver.changes | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/VERSION.cmake b/VERSION.cmake index dea1ff2..2cd69e3 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "13") -SET(LIBSATSOLVER_PATCH "2") +SET(LIBSATSOLVER_PATCH "3") # last released 0.13.1 diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 88aee31..07fd321 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jan 30 14:26:42 CET 2009 - mls(a)suse.de + +- fix weakmap boundary check +- 0.13.3 + +------------------------------------------------------------------- Tue Jan 27 13:06:52 CET 2009 - ma(a)suse.de - Ignore trailing whitespace in content file parser. -- 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> master : Implement SUSE_SoftwareInstallationService
by Michael Calmer 30 Jan '09

30 Jan '09

ref: refs/heads/master commit c7c51514407edc09a5d85bdc3dcc103334f6531c Author: Michael Calmer <mc(a)suse.de> Date: Fri Jan 30 14:13:06 2009 +0100 Implement SUSE_SoftwareInstallationService In the first step SUSE_SoftwareInstallationService is implemented as instance provider only --- mof/CMakeLists.txt | 2 + mof/SUSE_SoftwareInstallationService.mof | 23 ++++ mof/SUSE_SoftwareInstallationService.sfcb.reg | 5 + mof/deploy.mof | 1 + src/CMakeLists.txt | 2 + src/SUSE_SoftwareInstallationServiceProvider.cc | 127 +++++++++++++++++++++++ src/SUSE_SoftwareInstallationServiceProvider.h | 22 ++++ 7 files changed, 182 insertions(+), 0 deletions(-) diff --git a/mof/CMakeLists.txt b/mof/CMakeLists.txt index beb2bc3..920ae3d 100644 --- a/mof/CMakeLists.txt +++ b/mof/CMakeLists.txt @@ -10,6 +10,8 @@ INSTALL( FILES SUSE_MemberOfCollection.mof SUSE_HostedCollection.sfcb.reg SUSE_HostedCollection.mof + SUSE_SoftwareInstallationService.mof + SUSE_SoftwareInstallationService.sfcb.reg deploy.mof DESTINATION ${CMPIZYPP_DATA_DIR}/ ) diff --git a/mof/SUSE_SoftwareInstallationService.mof b/mof/SUSE_SoftwareInstallationService.mof new file mode 100644 index 0000000..4e7f5b9 --- /dev/null +++ b/mof/SUSE_SoftwareInstallationService.mof @@ -0,0 +1,23 @@ +//#pragma namespace ("root/cimv2") + + +// ------------------------------------------------------------------- +// ******************************************************************* +// Classes +// ******************************************************************* +// ------------------------------------------------------------------- + + + +// =================================================================== +// SUSE_SoftwareInstallationService +// =================================================================== + +[ Provider("cmpi:cmpi-zypp"), + Description ("A Class which provide a SoftwareInstallationService.") +] +class SUSE_SoftwareInstallationService : CIM_SoftwareInstallationService +{ +}; + + diff --git a/mof/SUSE_SoftwareInstallationService.sfcb.reg b/mof/SUSE_SoftwareInstallationService.sfcb.reg new file mode 100644 index 0000000..d5c1928 --- /dev/null +++ b/mof/SUSE_SoftwareInstallationService.sfcb.reg @@ -0,0 +1,5 @@ +[SUSE_SoftwareInstallationService] + provider: SUSE_SoftwareInstallationServiceProvider + location: cmpi-zypp + type: instance + namespace: root/cimv2 diff --git a/mof/deploy.mof b/mof/deploy.mof index bdda0bc..d6df3a7 100644 --- a/mof/deploy.mof +++ b/mof/deploy.mof @@ -4,4 +4,5 @@ #pragma include ("SUSE_SystemSpecificCollection.mof") #pragma include ("SUSE_MemberOfCollection.mof") #pragma include ("SUSE_HostedCollection.mof") +#pragma include ("SUSE_SoftwareInstallationService.mof") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7d95d11..f25077f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,6 +14,7 @@ SET( CMPIZYPP_SRCS SUSE_SystemSpecificCollectionProvider.cc SUSE_MemberOfCollectionProvider.cc SUSE_HostedCollectionProvider.cc + SUSE_SoftwareInstallationServiceProvider.cc ) SET( CMPIZYPP_HEADERS SUSE_Common.h @@ -24,6 +25,7 @@ SET( CMPIZYPP_HEADERS SUSE_MemberOfCollectionProvider.h SUSE_HostedCollectionProvider.h SUSE_AssocFilter.h + SUSE_SoftwareInstallationServiceProvider.h ) ADD_LIBRARY(cmpi-zypp SHARED ${CMPIZYPP_SRCS}) diff --git a/src/SUSE_SoftwareInstallationServiceProvider.cc b/src/SUSE_SoftwareInstallationServiceProvider.cc new file mode 100644 index 0000000..d1912c1 --- /dev/null +++ b/src/SUSE_SoftwareInstallationServiceProvider.cc @@ -0,0 +1,127 @@ + +#include <iostream> + +#include <cmpi/cmpimacs.h> +#include <cmpi/cmpidt.h> +#include <cmpi/CmpiResult.h> +#include <cmpi/CmpiBroker.h> +#include <cmpi/CmpiArray.h> +#include <cmpi/CmpiBooleanData.h> + +#include <zypp/base/String.h> +#include <zypp/base/LogTools.h> + +#include "SUSE_zypp.h" +#include "SUSE_Common.h" +#include "SUSE_SoftwareInstallationServiceProvider.h" + +using namespace zypp; +using std::endl; + +namespace cmpizypp +{ + namespace + { + const char * _ClassName = "SUSE_SoftwareInstallationService"; + const char * _Name = "ZYPP"; + } // namespace + + +SUSE_SoftwareInstallationServiceProviderClass::SUSE_SoftwareInstallationServiceProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ) + : CmpiBaseMI( mbp, ctx ) + , CmpiInstanceMI( mbp, ctx ) +{ +} + +CmpiStatus SUSE_SoftwareInstallationServiceProviderClass::enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() called",_ClassName)); + + CmpiObjectPath csop = get_this_computersystem(*broker, ctx, cop); + const char *sccn = csop.getKey("CreationClassName"); + const char *sn = csop.getKey("Name"); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + op.setKey( "SystemCreationClassName", sccn); + op.setKey( "SystemName", sn); + op.setKey( "CreationClassName", _ClassName); + op.setKey( "Name", _Name); + rslt.returnData( op ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstanceNames() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + +CmpiStatus SUSE_SoftwareInstallationServiceProviderClass::enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() called",_ClassName)); + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + CmpiInstance ci( op ); + + CmpiObjectPath csop = get_this_computersystem(*broker, ctx, cop); + const char *sccn = csop.getKey("CreationClassName"); + const char *sn = csop.getKey("Name"); + + const char * keys[] = { "SystemCreationClassName", "SystemName", "CreationClassName", "Name" }; + ci.setPropertyFilter( properties, keys ); + + ci.setProperty( "SystemCreationClassName", sccn ); + ci.setProperty( "SystemName", sn ); + ci.setProperty( "CreationClassName", _ClassName ); + ci.setProperty( "Name", _Name ); + + rslt.returnData( ci ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI EnumInstances() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + + +CmpiStatus SUSE_SoftwareInstallationServiceProviderClass::getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ) +{ + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() called",_ClassName)); + + const char *lsccn = cop.getKey("SystemCreationClassName"); + const char *lsn = cop.getKey("SystemName"); + const char *lccn = cop.getKey("CreationClassName"); + const char *ln = cop.getKey("Name"); + + CmpiObjectPath csop = get_this_computersystem(*broker, ctx, cop); + const char *sccn = csop.getKey("CreationClassName"); + const char *sn = csop.getKey("Name"); + + if( lsccn== NULL || lsn == NULL || lccn == NULL || ln == NULL || + ::strcmp(lccn, _ClassName) != 0 || ::strcmp(ln, _Name) != 0 || + ::strcmp(lsccn, sccn) != 0 || ::strcmp(lsn, sn) != 0) + { + CmpiStatus rc( CMPI_RC_ERR_FAILED, "Could not find this instance." ); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() failed : %s", _ClassName, rc.msg())); + return rc; + } + + CmpiObjectPath op( cop.getNameSpace(), _ClassName ); + CmpiInstance ci( op ); + + const char * keys[] = { "SystemCreationClassName", "SystemName", "CreationClassName", "Name" }; + ci.setPropertyFilter( properties, keys ); + + ci.setProperty( "SystemCreationClassName", sccn ); + ci.setProperty( "SystemName", sn ); + ci.setProperty( "CreationClassName", _ClassName ); + ci.setProperty( "Name", _Name ); + + rslt.returnData( ci ); + + rslt.returnDone(); + _CMPIZYPP_TRACE(1,("--- %s CMPI GetInstance() exited",_ClassName)); + return CmpiStatus(CMPI_RC_OK); +} + +} // namespace cmpizypp + +CMProviderBase( SUSE_SoftwareInstallationServiceProvider ); + +CMInstanceMIFactory( cmpizypp::SUSE_SoftwareInstallationServiceProviderClass, SUSE_SoftwareInstallationServiceProvider ); diff --git a/src/SUSE_SoftwareInstallationServiceProvider.h b/src/SUSE_SoftwareInstallationServiceProvider.h new file mode 100644 index 0000000..4d8714f --- /dev/null +++ b/src/SUSE_SoftwareInstallationServiceProvider.h @@ -0,0 +1,22 @@ +#ifndef SUSE_SOFTWAREINSTALLATIONSERVICEPROVIDER_H +#define SUSE_SOFTWAREINSTALLATIONSERVICEPROVIDER_H + +#include <cmpi/CmpiInstanceMI.h> + +namespace cmpizypp +{ + /** + */ + class SUSE_SoftwareInstallationServiceProviderClass : public CmpiInstanceMI + { + public: + SUSE_SoftwareInstallationServiceProviderClass( const CmpiBroker & mbp, const CmpiContext & ctx ); + + virtual CmpiStatus enumInstanceNames( const CmpiContext& ctx, CmpiResult& rslt, const CmpiObjectPath & cop ); + virtual CmpiStatus enumInstances( const CmpiContext & ctx, CmpiResult & rslt, const CmpiObjectPath & cop, const char** properties ); + virtual CmpiStatus getInstance( const CmpiContext &ctx, CmpiResult &rslt, const CmpiObjectPath &cop, const char **properties ); + }; + +} // namespace cmpizypp + +#endif // SUSE_SOFTWAREINSTALLATIONSERVICEPROVIDER_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] <backend> Update ignores
by Duncan Mac-Vicar P 30 Jan '09

30 Jan '09

commit eaa0e5489e61165ef9d840d65ca2aa4498618857 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Jan 30 14:00:44 2009 +0100 Update ignores --- .gitignore | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c62bf8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +*.la +*.o +*.lo +1 +1.7 +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +libzypp-zmd-backend.spec +ltmain.sh +missing +src/.deps/ +src/.libs/ +src/Makefile +src/Makefile.in +src/dbsource/.deps/ +src/dbsource/.libs/ +src/dbsource/Makefile +src/dbsource/Makefile.in +src/parse-metadata +src/query-pool +src/resolve-dependencies +src/service-delete +src/transact +src/update-status +src/zmd-list-locks +src/zmd-solver-testcase +src/zypp-sources +stamp-h1 + + -- 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] <backend> SuSE-SLE-10-SP3-Branch : Update ignores
by Duncan Mac-Vicar P 30 Jan '09

30 Jan '09

ref: refs/heads/SuSE-SLE-10-SP3-Branch commit eaa0e5489e61165ef9d840d65ca2aa4498618857 Author: Duncan Mac-Vicar P <dmacvicar(a)suse.de> Date: Fri Jan 30 14:00:44 2009 +0100 Update ignores --- .gitignore | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c62bf8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,42 @@ +*.la +*.o +*.lo +1 +1.7 +Makefile +Makefile.in +aclocal.m4 +autom4te.cache/ +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +libzypp-zmd-backend.spec +ltmain.sh +missing +src/.deps/ +src/.libs/ +src/Makefile +src/Makefile.in +src/dbsource/.deps/ +src/dbsource/.libs/ +src/dbsource/Makefile +src/dbsource/Makefile.in +src/parse-metadata +src/query-pool +src/resolve-dependencies +src/service-delete +src/transact +src/update-status +src/zmd-list-locks +src/zmd-solver-testcase +src/zypp-sources +stamp-h1 + + -- 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> initial Notes
by Michael Calmer 29 Jan '09

29 Jan '09

commit 5d313a13dc18eae97246223342f5f4588f01bd34 Author: Michael Calmer <mc(a)suse.de> Date: Thu Jan 29 17:08:55 2009 +0100 initial Notes --- doc/NOTES | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/doc/NOTES b/doc/NOTES new file mode 100644 index 0000000..ce0c39d --- /dev/null +++ b/doc/NOTES @@ -0,0 +1,60 @@ + +Notes about the Software-Update-Profile + +* the install() functions only allow to install a single RPM + and automatic dependency resolving is forbidden. + (forget for now installing software bundles) + + Dependencies should be modeled and the client should + walk them backwards and install each of them separately. + (This is how we understand this profile) + + This cannot work because we have situations where + + packageA requires packageB and packageB requires packageA + + install() take only one RPM per call, so this situation cannot be + solved. + + Possible solutions: + + 1) add an install() function which takes an array of software identities + which should be installed. + + 2) add a parameter which allows install() to solve dependencies automatically + + The second one is better to solve this problem. The first option is also + use full if a user has selected more then one RPM in a UI which should be + installed. + +* CIM_ConcreteJob + + Is it possible to use this for a communication with the client and ask questions? + Like: + * accept keys + * display automatic resolved dependencies and get a OK for installation + * media change (Please insert CD2) + * etc. + +* Unclear InstallCharacteristics + + * Force Install + * Install + * Update + + - How would these behave in case of automatic resolve dependencies? + - How should these behave in case of patterns and patches? + +* Patterns and Patches + + New types of SoftwareIdentity required (Classifications) ? + + They are not really SoftwareBundles. Install a Bundle would require + that all software in it must be installed and the Bundle itself + but be installed (need a representation in the system) + + Both - Pattern and Patches - are only "satisfied" but not "installed". + + Install a Patch means: Update any package listed to a version (or higher) + listed in the patch. Only update, no new installation. + -- 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> - stay in weakmap boundaries
by Michael Schroeder 29 Jan '09

29 Jan '09

commit efaada07b66ef501902cc01e50e4202feb3693d9 Author: Michael Schroeder <mls(a)suse.de> Date: Thu Jan 29 17:05:35 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 a03b26a..74669b5 100644 --- a/src/solver.c +++ b/src/solver.c @@ -726,7 +726,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