From f2d22b1221a1751b60ccf6be74a28040494ebad4bfb1f7486a6a22fe166c4d5e Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Thu, 8 Jan 2009 16:58:08 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/cmpi-provider-register?expand=0&rev=2

---
 cmpi-provider-register.changes |  6 ++++++
 cmpi-provider-register.py      | 27 +++++++++++++++++++++++----
 cmpi-provider-register.spec    |  7 +++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/cmpi-provider-register.changes b/cmpi-provider-register.changes
index d8816b3..0584806 100644
--- a/cmpi-provider-register.changes
+++ b/cmpi-provider-register.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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. 
+
 -------------------------------------------------------------------
 Tue Oct 14 09:03:19 MDT 2008 - bwhiteley@suse.de
 
diff --git a/cmpi-provider-register.py b/cmpi-provider-register.py
index be987d8..41c66e1 100644
--- a/cmpi-provider-register.py
+++ b/cmpi-provider-register.py
@@ -36,6 +36,7 @@ import os
 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_init_script = '/etc/init.d/scx-cimd'
 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 @@ def process_sfcb(mof, stage, remove=False):
     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 @@ def process_pegasus(mof, mofcomp, init_script, cimserver_exe, remove=False,
                 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 @@ if __name__ == '__main__':
             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,
                          })
 
diff --git a/cmpi-provider-register.spec b/cmpi-provider-register.spec
index 1007eba..1b301b8 100644
--- a/cmpi-provider-register.spec
+++ b/cmpi-provider-register.spec
@@ -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 @@ rm -rf "$RPM_BUILD_ROOT"
 %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.