/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum-2.6.0.bz6940.mismatch.btwn.manager.and.cli.patch
ViewVC logotype

Contents of /rpms/smeserver-yum/sme10/smeserver-yum-2.6.0.bz6940.mismatch.btwn.manager.and.cli.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Revision 1.3 - (show annotations) (download)
Mon Jul 11 15:20:37 2022 UTC (2 years, 3 months ago) by jpp
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +0 -0 lines
Error occurred while calculating annotation data.
FILE REMOVED
bump version

1 diff -Nur smeserver-yum-2.6.0.old/root/sbin/e-smith/check4updates smeserver-yum-2.6.0/root/sbin/e-smith/check4updates
2 --- smeserver-yum-2.6.0.old/root/sbin/e-smith/check4updates 2019-12-05 20:33:02.976000000 -0500
3 +++ smeserver-yum-2.6.0/root/sbin/e-smith/check4updates 2019-12-05 21:05:07.132000000 -0500
4 @@ -21,6 +21,9 @@
5 if [ $? = 100 ]; then
6 echo -e "===\n=== yum reports available updates:\n===" >> $TMPFILE
7 cat $TMP1 >> $TMPFILE
8 + # we have updates, let's inform the server-manager
9 + /usr/bin/sv o yum
10 +
11 fi
12
13 if [ -s $TMPFILE ]; then
14 diff -Nur smeserver-yum-2.6.0.old/root/sbin/e-smith/yum_update_dbs smeserver-yum-2.6.0/root/sbin/e-smith/yum_update_dbs
15 --- smeserver-yum-2.6.0.old/root/sbin/e-smith/yum_update_dbs 2019-12-05 20:33:03.007000000 -0500
16 +++ smeserver-yum-2.6.0/root/sbin/e-smith/yum_update_dbs 2019-12-05 21:03:32.393000000 -0500
17 @@ -40,12 +40,16 @@
18 # For speed and to reduce log noise, we don't use
19 # the esmith::DB routines here
20
21 -# XXX - FIXME - We should add -R xxx to sleep for a while
22 -
23 +# We do not use -R xxx to sleep for a while, as we do this at cron level
24 +# this allows faster results when needed or delayed when not
25 +
26 use constant YUM_CMD => "/usr/bin/yum -d 0 -e 0 ";
27
28 # avoid error with no installed groups file.
29 -system("YUM_CMD groups mark convert -d 0 -e 0 1>/dev/null") unless (-d "/var/lib/yum/groups/");
30 +system(YUM_CMD." groups mark convert -d 0 -e 0 1>/dev/null") unless (-d "/var/lib/yum/groups/");
31 +
32 +# yum check to have fresh metadata
33 +system(YUM_CMD." check-update 1>/dev/null");
34
35 my $tmp_file;
36
37 diff -Nur smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py
38 --- smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py 2019-12-05 20:33:02.989000000 -0500
39 +++ smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py 2019-12-05 22:20:38.831000000 -0500
40 @@ -300,6 +300,8 @@
41 if smechange:
42 os.spawnl(os.P_WAIT, config_set, config_set, 'set', 'UnsavedChanges', 'yes')
43 os.spawnl(os.P_WAIT, navigation_conf, navigation_conf)
44 + print "Reload yum db for server-manager"
45 + os.spawnl(os.P_WAIT, yum_update_dbs, yum_update_dbs)
46
47 def close_hook(conduit):
48 if ourfile and os.path.isfile('/var/run/yum.status'):
49 diff -Nur smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py
50 --- smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py 2019-12-08 19:11:39.664000000 -0500
51 +++ smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py 2019-12-08 19:14:55.087000000 -0500
52 @@ -11,6 +11,7 @@
53 events_path = '/etc/e-smith/events'
54 initialize_database = events_path + '/actions/initialize-default-databases'
55 navigation_conf = events_path + '/actions/navigation-conf'
56 +yum_update_dbs = events_path + '/actions/yum-update-dbs'
57 signal_event = '/sbin/e-smith/signal-event'
58 config_set = '/sbin/e-smith/config'
59 status_file = '/var/run/yum.status'

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed