smeserver-yum/sme10/smeserver-yum-2.6.0.bz9388.no-double-contribs-check.patch

diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates
--- smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates        2016-02-05 18:19:58.000000000 -0500
+++ smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates    2019-01-23 20:32:05.803000000 -0500
@@ -1,5 +1,10 @@
 {
-    return "\n# yum check for smecontribs updates is disabled\n" unless (($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled'));
+    use esmith::ConfigDB;
+    my $ydb = esmith::ConfigDB->open_ro('yum_repositories')
+        or die "Couldn't open yum_repositories";
+    my $smecontribs=$ydb->get_prop('smecontribs','status') || 'disabled';
+
+    return "\n# yum check for smecontribs updates is disabled\n" unless ( ($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled') && ($smecontribs eq 'disabled') );
  
     my $freq = $yum{check4updates} || 'daily';
 
1	diff -Nur smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates
2	--- smeserver-yum-2.6.0.old/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 2016-02-05 18:19:58.000000000 -0500
3	+++ smeserver-yum-2.6.0/root/etc/e-smith/templates/etc/crontab/check4contribsupdates 2019-01-23 20:32:05.803000000 -0500
4	@@ -1,5 +1,10 @@
5	{
6	- return "\n# yum check for smecontribs updates is disabled\n" unless (($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled'));
7	+ use esmith::ConfigDB;
8	+ my $ydb = esmith::ConfigDB->open_ro('yum_repositories')
9	+ or die "Couldn't open yum_repositories";
10	+ my $smecontribs=$ydb->get_prop('smecontribs','status') \|\| 'disabled';
11	+
12	+ return "\n# yum check for smecontribs updates is disabled\n" unless ( ($yum{status} eq 'enabled') && ($yum{CheckContribs} eq 'enabled') && ($smecontribs eq 'disabled') );
13
14	my $freq = $yum{check4updates} \|\| 'daily';
15