1 |
stephdl |
1.1 |
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/db/configuration/defaults/yum/DeltaRpmProcess smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/db/configuration/defaults/yum/DeltaRpmProcess |
2 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/db/configuration/defaults/yum/DeltaRpmProcess 1970-01-01 01:00:00.000000000 +0100 |
3 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/db/configuration/defaults/yum/DeltaRpmProcess 2016-07-27 16:03:19.325764388 +0200 |
4 |
|
|
@@ -0,0 +1 @@ |
5 |
|
|
+disabled |
6 |
|
|
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum |
7 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2016-02-06 00:19:56.000000000 +0100 |
8 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2016-07-28 03:07:51.050115158 +0200 |
9 |
|
|
@@ -259,5 +259,17 @@ |
10 |
|
|
<base>3MONTHLY</base> |
11 |
|
|
<trans>Monthly</trans> |
12 |
|
|
</entry> |
13 |
|
|
- |
14 |
|
|
+ |
15 |
|
|
+ <entry> |
16 |
|
|
+ <base>LABEL_YUM_DELTARPMPROCESS</base> |
17 |
|
|
+ <trans>Delta Rpm Update</trans> |
18 |
|
|
+ </entry> |
19 |
|
|
+ |
20 |
|
|
+ <entry> |
21 |
|
|
+ <base>LABEL_YUM_DELTARPM</base> |
22 |
|
|
+ <trans>A deltarpm contains the difference between an old and a new version of a rpm, |
23 |
|
|
+ which can save bandwith. The drawback is that update |
24 |
|
|
+ operations consume considerably more CPU cycles</trans> |
25 |
|
|
+ </entry> |
26 |
|
|
+ |
27 |
|
|
</lexicon> |
28 |
|
|
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/templates/etc/yum.conf/10main_deltarpm smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/templates/etc/yum.conf/10main_deltarpm |
29 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/templates/etc/yum.conf/10main_deltarpm 1970-01-01 01:00:00.000000000 +0100 |
30 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/templates/etc/yum.conf/10main_deltarpm 2016-07-28 03:04:17.146569284 +0200 |
31 |
|
|
@@ -0,0 +1,6 @@ |
32 |
|
|
+{ |
33 |
|
|
+my $deltaRpm = $yum{DeltaRpmProcess} || 'disabled'; |
34 |
|
|
+$deltaRpm = '0' if ($deltaRpm eq 'disabled'); |
35 |
|
|
+$deltaRpm = '2' if ($deltaRpm eq 'enabled'); |
36 |
|
|
+$OUT .= "deltarpm=$deltaRpm"; |
37 |
|
|
+} |
38 |
|
|
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories |
39 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2013-01-31 17:35:08.000000000 +0100 |
40 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/templates/etc/yum.smerepos.d/sme-base.repo/20repositories 2016-07-22 12:39:51.712834542 +0200 |
41 |
|
|
@@ -47,6 +47,12 @@ |
42 |
|
|
$OUT .= "gpgkey" . '=' . $props{GPGKey} . "\n"; |
43 |
|
|
} |
44 |
|
|
|
45 |
|
|
+ if (exists $props{DeltaRpmPercentage}) |
46 |
|
|
+ { |
47 |
|
|
+ my $deltarpmpercentage = $props{DeltaRpmPercentage}; |
48 |
|
|
+ $deltarpmpercentage = '0' if ($deltarpmpercentage eq 'disabled'); |
49 |
|
|
+ $OUT .= "deltarpm_percentage" . '=' . $deltarpmpercentage . "\n"; |
50 |
|
|
+ } |
51 |
|
|
|
52 |
|
|
$OUT .= "\n"; |
53 |
|
|
} |
54 |
|
|
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/web/functions/yum smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/web/functions/yum |
55 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/etc/e-smith/web/functions/yum 2013-01-31 17:35:08.000000000 +0100 |
56 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/etc/e-smith/web/functions/yum 2016-07-28 03:06:35.682275166 +0200 |
57 |
|
|
@@ -126,6 +126,13 @@ |
58 |
|
|
|
59 |
|
|
<field |
60 |
|
|
type="literal" |
61 |
|
|
+ id="state_deltarpmprocess" |
62 |
|
|
+ value="get_status('DeltaRpmProcess', 'localise')"> |
63 |
|
|
+ <label>LABEL_YUM_DELTARPMPROCESS</label> |
64 |
|
|
+ </field> |
65 |
|
|
+ |
66 |
|
|
+ <field |
67 |
|
|
+ type="literal" |
68 |
|
|
id="button_configuration" |
69 |
|
|
value=""> |
70 |
|
|
<description>DESC_BUTTON_CONFIGURATION</description> |
71 |
|
|
@@ -245,6 +252,14 @@ |
72 |
|
|
<description>DESC_ENABLED_REPOSITORIES</description> |
73 |
|
|
</field> |
74 |
|
|
|
75 |
|
|
+ <field |
76 |
|
|
+ type="select" |
77 |
|
|
+ id="yum_DeltaRpmProcess" |
78 |
|
|
+ options="'disabled' => 'DISABLED','enabled'=>'ENABLED'" |
79 |
|
|
+ value="get_status('DeltaRpmProcess')"> |
80 |
|
|
+ <label>LABEL_YUM_DELTARPMPROCESS</label> |
81 |
|
|
+ <description>LABEL_YUM_DELTARPM</description> |
82 |
|
|
+ </field> |
83 |
|
|
|
84 |
|
|
<subroutine src="print_button('SAVE')" /> |
85 |
|
|
</page> |
86 |
|
|
diff -Nur smeserver-yum-2.6.0.bz8834.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm smeserver-yum-2.6.0.bz8834.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm |
87 |
|
|
--- smeserver-yum-2.6.0.bz8834.old/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2013-01-31 17:35:08.000000000 +0100 |
88 |
|
|
+++ smeserver-yum-2.6.0.bz8834.new/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/yum.pm 2016-07-27 16:02:34.678859179 +0200 |
89 |
|
|
@@ -207,6 +207,9 @@ |
90 |
|
|
$db->set_prop('yum', 'check4updates', $check4updates); |
91 |
|
|
$db->set_prop('yum', 'status', $status); |
92 |
|
|
|
93 |
|
|
+ my $deltarpm = $q->param("yum_DeltaRpmProcess"); |
94 |
|
|
+ $db->set_prop('yum', 'DeltaRpmProcess', $deltarpm); |
95 |
|
|
+ |
96 |
|
|
my %selected = map {$_ => 1} $q->param('SelectedRepositories'); |
97 |
|
|
|
98 |
|
|
foreach my $repos ( |