Hello community, here is the log from the commit of package cmpi-provider-register for openSUSE:Factory checked in at Thu Jan 8 17:58:06 CET 2009. -------- --- cmpi-provider-register/cmpi-provider-register.changes 2008-10-21 18:23:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmpi-provider-register/cmpi-provider-register.changes 2008-12-23 18:28:22.486363000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 23 10:27:17 MST 2008 - bwhiteley@suse.de + +- Properly handle registration with Microsoft SCX cim server, + so scx upgrades don't break us. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmpi-provider-register.spec ++++++ --- /var/tmp/diff_new_pack.H23992/_old 2009-01-08 17:57:54.000000000 +0100 +++ /var/tmp/diff_new_pack.H23992/_new 2009-01-08 17:57:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package cmpi-provider-register (Version 1.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ Name: cmpi-provider-register Version: 1.0 -Release: 1 +Release: 2 License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/Management @@ -54,6 +54,9 @@ %defattr(-,root,root) /usr/sbin/* %changelog +* Tue Dec 23 2008 bwhiteley@suse.de +- Properly handle registration with Microsoft SCX cim server, + so scx upgrades don't break us. * Tue Oct 14 2008 bwhiteley@suse.de - Added license to script (bnc:434694) - Don't fail if link destinations exist; only warn. ++++++ cmpi-provider-register.py ++++++ --- /var/tmp/diff_new_pack.H23992/_old 2009-01-08 17:57:54.000000000 +0100 +++ /var/tmp/diff_new_pack.H23992/_new 2009-01-08 17:57:54.000000000 +0100 @@ -36,6 +36,7 @@ import errno import sys from subprocess import call, PIPE, STDOUT, Popen +from getpass import getpass import pywbem sfcb_init_script = '/etc/init.d/sfcb' @@ -49,6 +50,7 @@ scx_cimserver_exe = scx_home + '/bin/scxcimserver' scx_unix_socket = '/var' + scx_home + '/tmp/cim.socket' scx_provider_dir = scx_home + '/lib/providers' +scx_ext_dir = '/opt/microsoft/scx/lib/providers/ext' if os.path.isdir('/usr/lib64/cmpi'): cmpi_dir = '/usr/lib64/cmpi' @@ -107,9 +109,9 @@ mofcomp = SimpleCompiler() files = [] files = mofcomp.compile_file(mof, None) - for file in files: - dest = stage + '/mofs/' + file[0] - src = file[1] + for file_ in files: + dest = stage + '/mofs/' + file_[0] + src = file_[1] if not remove: if not os.path.exists(dest): os.makedirs(dest) @@ -233,6 +235,23 @@ if inst.classname.lower() == 'pg_providermodule'] providers = list(set(providers)) + for reg in peg_regs: + dest = provider_dir + '/' + os.path.basename(reg) + if not dest.endswith('.mof'): + dest += '.mof' + if not remove: + if not os.path.exists(dest): + try: + os.symlink(reg, dest) + except OSError, e: + print e + else: + if os.path.islink(dest): + try: + os.unlink(dest) + except OSError, e: + print e + for provider in providers: libname = 'lib' + provider + '.so' src = cmpi_dir + '/' + libname @@ -367,7 +386,7 @@ pegs.append({'url':scx_unix_socket, 'exe':scx_cimserver_exe, 'init':scx_init_script, - 'provider_dir':scx_provider_dir, + 'provider_dir':scx_ext_dir, 'env':env, }) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org