smeserver-yum/sme8/smeserver-yum-2.2.0-fixremove.patch

diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
--- smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove 2009-11-05 11:39:13.000000000 -0700
+++ smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py   2009-11-05 11:39:53.000000000 -0700
@@ -16,18 +16,13 @@ config_set = '/sbin/e-smith/config'
 status_file  = '/var/run/yum.status'
 
 smechange = False
+ourfile = False
 
 def report_yum_status(status):
        fileHandle = open(status_file, 'w')
        fileHandle.write(status)
        fileHandle.close()
 
-def config_hook(conduit):
-       report_yum_status('config')
-
-def init_hook(conduit):
-       report_yum_status('init')
-
 def predownload_hook(conduit):
        report_yum_status('predownload')
 
@@ -35,6 +30,8 @@ def postdownload_hook(conduit):
        report_yum_status('postdownload')
 
 def prereposetup_hook(conduit):
+       global ourfile
+       ourfile = True
        report_yum_status('prereposetup')
 
 def postreposetup_hook(conduit):
@@ -52,15 +49,12 @@ def postresolve_hook(conduit):
 def pretrans_hook(conduit):
        report_yum_status('pretrans')
        ts = conduit.getTsInfo()
-       for tsmem in ts.getMembers():
-               print "smeserver trap pre-install: " + tsmem.name
 
 def posttrans_hook(conduit):
        global smechange
        report_yum_status('posttrans')
        ts = conduit.getTsInfo()
        for tsmem in ts.getMembers():
-               print "smeserver trap post-install: " + tsmem.name
                smeevent = 'yum-reconfigure-' + tsmem.name
                if os.path.isdir(events_path + '/' + smeevent):
                        print "smeservers signal-event: " + smeevent
@@ -77,7 +71,7 @@ def posttrans_hook(conduit):
                os.spawnl(os.P_WAIT, navigation_conf, navigation_conf)
 
 def close_hook(conduit):
-       if os.path.isfile('/var/run/yum.status'):
+       if ourfile and os.path.isfile('/var/run/yum.status'):
                os.unlink('/var/run/yum.status')
 
        if smechange:
1	slords	1.1	diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
2			diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
3			diff -up smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py
4			--- smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py.fixremove 2009-11-05 11:39:13.000000000 -0700
5			+++ smeserver-yum-2.0.0/root/usr/lib/yum-plugins/smeserver.py 2009-11-05 11:39:53.000000000 -0700
6			@@ -16,18 +16,13 @@ config_set = '/sbin/e-smith/config'
7			status_file = '/var/run/yum.status'
8
9			smechange = False
10			+ourfile = False
11
12			def report_yum_status(status):
13			fileHandle = open(status_file, 'w')
14			fileHandle.write(status)
15			fileHandle.close()
16
17			-def config_hook(conduit):
18			- report_yum_status('config')
19			-
20			-def init_hook(conduit):
21			- report_yum_status('init')
22			-
23			def predownload_hook(conduit):
24			report_yum_status('predownload')
25
26			@@ -35,6 +30,8 @@ def postdownload_hook(conduit):
27			report_yum_status('postdownload')
28
29			def prereposetup_hook(conduit):
30			+ global ourfile
31			+ ourfile = True
32			report_yum_status('prereposetup')
33
34			def postreposetup_hook(conduit):
35			@@ -52,15 +49,12 @@ def postresolve_hook(conduit):
36			def pretrans_hook(conduit):
37			report_yum_status('pretrans')
38			ts = conduit.getTsInfo()
39			- for tsmem in ts.getMembers():
40			- print "smeserver trap pre-install: " + tsmem.name
41
42			def posttrans_hook(conduit):
43			global smechange
44			report_yum_status('posttrans')
45			ts = conduit.getTsInfo()
46			for tsmem in ts.getMembers():
47			- print "smeserver trap post-install: " + tsmem.name
48			smeevent = 'yum-reconfigure-' + tsmem.name
49			if os.path.isdir(events_path + '/' + smeevent):
50			print "smeservers signal-event: " + smeevent
51			@@ -77,7 +71,7 @@ def posttrans_hook(conduit):
52			os.spawnl(os.P_WAIT, navigation_conf, navigation_conf)
53
54			def close_hook(conduit):
55			- if os.path.isfile('/var/run/yum.status'):
56			+ if ourfile and os.path.isfile('/var/run/yum.status'):
57			os.unlink('/var/run/yum.status')
58
59			if smechange: