| 1 |
jpp |
1.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 22:29:05.351000000 -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 |
|
|
@@ -63,6 +67,8 @@ |
| 38 |
|
|
open YUM, "-|", YUM_CMD . "list $list_option" or |
| 39 |
|
|
die "Couldn't call yum list $list_option\n"; |
| 40 |
|
|
|
| 41 |
|
|
+ #strip header, preventing inclusion as package |
| 42 |
|
|
+ my $header = <YUM>; |
| 43 |
|
|
while ( <YUM> ) |
| 44 |
|
|
{ |
| 45 |
|
|
my ($package, $version, $repo) = split /\s+/; |
| 46 |
|
|
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 |
| 47 |
|
|
--- smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py 2019-12-05 20:33:02.989000000 -0500 |
| 48 |
|
|
+++ smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py 2019-12-05 22:20:38.831000000 -0500 |
| 49 |
|
|
@@ -300,6 +300,8 @@ |
| 50 |
|
|
if smechange: |
| 51 |
|
|
os.spawnl(os.P_WAIT, config_set, config_set, 'set', 'UnsavedChanges', 'yes') |
| 52 |
|
|
os.spawnl(os.P_WAIT, navigation_conf, navigation_conf) |
| 53 |
|
|
+ print "Reload yum db for server-manager" |
| 54 |
|
|
+ os.spawnl(os.P_WAIT, yum_update_dbs, yum_update_dbs) |
| 55 |
|
|
|
| 56 |
|
|
def close_hook(conduit): |
| 57 |
|
|
if ourfile and os.path.isfile('/var/run/yum.status'): |
Parent Directory
| 
Revision Log
| 
Revision Graph
