/[smeserver]/rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-updatetoggle.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme8/smeserver-yum-2.2.0-updatetoggle.patch

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

Revision 1.2 - (hide annotations) (download)
Tue Sep 15 16:43:50 2009 UTC (14 years, 8 months ago) by slords
Branch: MAIN
CVS Tags: smeserver-yum-2_2_0-14_el5_sme, smeserver-yum-2_2_0-24_el5_sme, smeserver-yum-2_2_0-22_el5_sme, smeserver-yum-2_2_0-10_el5_sme, smeserver-yum-2_2_0-16_el5_sme, smeserver-yum-2_2_0-26_el5_sme, smeserver-yum-2_2_0-18_el5_sme, smeserver-yum-2_2_0-12_el5_sme, smeserver-yum-2_2_0-17_el5_sme, smeserver-yum-2_2_0-20_el5_sme, smeserver-yum-2_2_0-23_el5_sme, smeserver-yum-2_2_0-13_el5_sme, smeserver-yum-2_2_0-15_el5_sme, smeserver-yum-2_2_0-19_el5_sme, smeserver-yum-2_2_0-11_el5_sme, smeserver-yum-2_2_0-21_el5_sme, smeserver-yum-2_2_0-25_el5_sme, HEAD
Changes since 1.1: +4 -16 lines 
* Tue Sep 15 2009 Shad L. Lords <slords@mail.com> 2.2.0-10.sme
- set unsaved changes in yum event [SME: 5475]
- move yum warming to sme yum plugin [SME: 5474]
- ensure file exists before unlinking [SME: 5476]
- remove semicolons from yum plugin
1 slords 1.2 --- smeserver-yum-2.2.0/root/etc/e-smith/db/configuration/defaults/yum/check4updates.d 2009-09-15 10:19:24.000000000 -0600
2     +++ smeserver-yum-2.2.0/root/etc/e-smith/db/configuration/defaults/yum/check4updates 2009-09-15 10:19:30.000000000 -0600
3     @@ -0,0 +1 @@
4     +daily
5 dungog 1.1 diff -urN smeserver-yum-2.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum smeserver-yum-2.2.0.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
6     --- smeserver-yum-2.2.0/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2008-10-08 01:25:45.000000000 +1100
7     +++ smeserver-yum-2.2.0.new/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum 2009-09-12 18:04:01.000000000 +1000
8     @@ -13,7 +13,7 @@
9    
10     <entry>
11     <base>LABEL_YUM_STATUS</base>
12     - <trans>Check for updates daily</trans>
13     + <trans>Check for updates</trans>
14     </entry>
15    
16     <entry>
17     @@ -245,4 +245,19 @@
18     </trans>
19     </entry>
20    
21     + <entry>
22     + <base>1DAILY</base>
23     + <trans>Daily</trans>
24     + </entry>
25     +
26     + <entry>
27     + <base>2WEEKLY</base>
28     + <trans>Weekly</trans>
29     + </entry>
30     +
31     + <entry>
32     + <base>3MONTHLY</base>
33     + <trans>Monthly</trans>
34     + </entry>
35     +
36     </lexicon>
37     diff -urN smeserver-yum-2.2.0/root/etc/e-smith/web/functions/yum smeserver-yum-2.2.0.new/root/etc/e-smith/web/functions/yum
38     --- smeserver-yum-2.2.0/root/etc/e-smith/web/functions/yum 2008-10-08 01:25:45.000000000 +1100
39     +++ smeserver-yum-2.2.0.new/root/etc/e-smith/web/functions/yum 2009-09-12 18:06:39.000000000 +1000
40     @@ -221,9 +221,9 @@
41    
42     <field
43     type="select"
44     - id="yum_status"
45     - options="'disabled' => 'DISABLED', 'enabled' => 'ENABLED'"
46     - value="get_status('status')">
47     + id="yum_check4updates"
48     + options="'disabled' => 'DISABLED', 'daily' => '1DAILY', 'weekly' => '2WEEKLY', 'monthly' => '3MONTHLY'"
49     + value="get_status('check4updates')">
50     <label>LABEL_YUM_STATUS</label>
51     </field>
52    
53     diff -urN smeserver-yum-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm smeserver-yum-2.2.0.new/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm
54     --- smeserver-yum-2.2.0/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2008-10-08 01:25:45.000000000 +1100
55     +++ smeserver-yum-2.2.0.new/root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm 2009-09-12 18:14:24.000000000 +1000
56     @@ -193,13 +193,20 @@
57     my $q = $fm->{'cgi'};
58    
59     for my $param ( qw(
60     - status
61     PackageFunctions
62     ) )
63     {
64     $db->set_prop('yum', $param, $q->param("yum_$param"));
65     }
66    
67     + my $check4updates = $q->param("yum_check4updates");
68     + my $status = 'disabled';
69     +
70     + if ($check4updates ne 'disabled') { $status = 'enabled'; }
71     +
72     + $db->set_prop('yum', 'check4updates', $check4updates);
73     + $db->set_prop('yum', 'status', $status);
74     +
75     my %selected = map {$_ => 1} $q->param('SelectedRepositories');
76    
77     foreach my $repos (
78     diff -urN smeserver-yum-2.2.0/smeserver-yum-1.1.2-26-filelist smeserver-yum-2.2.0.new/smeserver-yum-1.1.2-26-filelist
79     --- smeserver-yum-2.2.0/smeserver-yum-1.1.2-26-filelist 2006-03-16 17:22:22.000000000 +1100
80     +++ smeserver-yum-2.2.0.new/smeserver-yum-1.1.2-26-filelist 1970-01-01 10:00:00.000000000 +1000
81     @@ -1,219 +0,0 @@
82     -%dir %attr(0755,root,root) /service
83     -%dir %attr(0755,root,root) /service/yum
84     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith
85     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick
86     -%dir %attr(0755,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel
87     -%attr(0644,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm.orig
88     -%attr(0644,root,root) /usr/lib/perl5/site_perl/esmith/FormMagick/Panel/yum.pm
89     -%dir %attr(0755,root,root) /usr/share/rpm-gpg-keys
90     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-rawhide
91     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.dag.txt
92     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-beta
93     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY
94     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora-rawhide
95     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.dries.txt
96     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora-test
97     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-SMEServer7
98     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-CentOS-3
99     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-CentOS-4
100     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-freshrpms
101     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY.atrpms
102     -/usr/share/rpm-gpg-keys/RPM-GPG-KEY-fedora
103     -%attr(0700,root,root) /etc/cron.daily/smeserver-yum
104     -%dir %attr(0755,root,root) /etc/e-smith
105     -%dir %attr(0755,root,root) /etc/e-smith/web
106     -%dir %attr(0550,root,admin) /etc/e-smith/web/panels
107     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager
108     -%dir %attr(0755,root,root) /etc/e-smith/web/panels/manager/cgi-bin
109     -/etc/e-smith/web/panels/manager/cgi-bin/yum
110     -%dir %attr(0550,root,admin) /etc/e-smith/web/functions
111     -%attr(04750,root,admin) /etc/e-smith/web/functions/yum
112     -%dir %attr(0755,root,root) /etc/e-smith/templates
113     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc
114     -%dir %attr(0755,root,root) /etc/e-smith/templates/etc/yum.conf
115     -/etc/e-smith/templates/etc/yum.conf/10main_debuglevel
116     -/etc/e-smith/templates/etc/yum.conf/10main_installonlypkgs
117     -/etc/e-smith/templates/etc/yum.conf/10main_cachedir
118     -/etc/e-smith/templates/etc/yum.conf/10main_exactarch
119     -/etc/e-smith/templates/etc/yum.conf/10main_logfile
120     -/etc/e-smith/templates/etc/yum.conf/10main
121     -/etc/e-smith/templates/etc/yum.conf/10main_obsoletes
122     -/etc/e-smith/templates/etc/yum.conf/20repositories
123     -/etc/e-smith/templates/etc/yum.conf/10main_tolerant
124     -%dir %attr(0755,root,root) /etc/e-smith/locale
125     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us
126     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc
127     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith
128     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith/web
129     -%dir %attr(0755,root,root) /etc/e-smith/locale/en-us/etc/e-smith/web/functions
130     -/etc/e-smith/locale/en-us/etc/e-smith/web/functions/yum
131     -%dir %attr(0755,root,root) /etc/e-smith/db
132     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories
133     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/migrate
134     -/etc/e-smith/db/yum_repositories/migrate/20SMERepos
135     -/etc/e-smith/db/yum_repositories/migrate/00openRW
136     -/etc/e-smith/db/yum_repositories/migrate/10GPG_and_Groups
137     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults
138     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/centosplus
139     -/etc/e-smith/db/yum_repositories/defaults/centosplus/type
140     -/etc/e-smith/db/yum_repositories/defaults/centosplus/BaseURL
141     -/etc/e-smith/db/yum_repositories/defaults/centosplus/status
142     -/etc/e-smith/db/yum_repositories/defaults/centosplus/Name
143     -/etc/e-smith/db/yum_repositories/defaults/centosplus/GPGCheck
144     -/etc/e-smith/db/yum_repositories/defaults/centosplus/EnableGroups
145     -/etc/e-smith/db/yum_repositories/defaults/centosplus/Visible
146     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/extras
147     -/etc/e-smith/db/yum_repositories/defaults/extras/type
148     -/etc/e-smith/db/yum_repositories/defaults/extras/BaseURL
149     -/etc/e-smith/db/yum_repositories/defaults/extras/status
150     -/etc/e-smith/db/yum_repositories/defaults/extras/Name
151     -/etc/e-smith/db/yum_repositories/defaults/extras/GPGCheck
152     -/etc/e-smith/db/yum_repositories/defaults/extras/EnableGroups
153     -/etc/e-smith/db/yum_repositories/defaults/extras/Visible
154     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/base
155     -/etc/e-smith/db/yum_repositories/defaults/base/type
156     -/etc/e-smith/db/yum_repositories/defaults/base/BaseURL
157     -/etc/e-smith/db/yum_repositories/defaults/base/status
158     -/etc/e-smith/db/yum_repositories/defaults/base/Name
159     -/etc/e-smith/db/yum_repositories/defaults/base/GPGCheck
160     -/etc/e-smith/db/yum_repositories/defaults/base/EnableGroups
161     -/etc/e-smith/db/yum_repositories/defaults/base/Visible
162     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeupdates
163     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/type
164     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/BaseURL
165     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/status
166     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/Name
167     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/GPGCheck
168     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/EnableGroups
169     -/etc/e-smith/db/yum_repositories/defaults/smeupdates/Visible
170     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/updates
171     -/etc/e-smith/db/yum_repositories/defaults/updates/type
172     -/etc/e-smith/db/yum_repositories/defaults/updates/BaseURL
173     -/etc/e-smith/db/yum_repositories/defaults/updates/status
174     -/etc/e-smith/db/yum_repositories/defaults/updates/Name
175     -/etc/e-smith/db/yum_repositories/defaults/updates/GPGCheck
176     -/etc/e-smith/db/yum_repositories/defaults/updates/EnableGroups
177     -/etc/e-smith/db/yum_repositories/defaults/updates/Visible
178     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/contrib
179     -/etc/e-smith/db/yum_repositories/defaults/contrib/type
180     -/etc/e-smith/db/yum_repositories/defaults/contrib/BaseURL
181     -/etc/e-smith/db/yum_repositories/defaults/contrib/status
182     -/etc/e-smith/db/yum_repositories/defaults/contrib/Name
183     -/etc/e-smith/db/yum_repositories/defaults/contrib/GPGCheck
184     -/etc/e-smith/db/yum_repositories/defaults/contrib/EnableGroups
185     -/etc/e-smith/db/yum_repositories/defaults/contrib/Visible
186     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/addons
187     -/etc/e-smith/db/yum_repositories/defaults/addons/type
188     -/etc/e-smith/db/yum_repositories/defaults/addons/BaseURL
189     -/etc/e-smith/db/yum_repositories/defaults/addons/status
190     -/etc/e-smith/db/yum_repositories/defaults/addons/Name
191     -/etc/e-smith/db/yum_repositories/defaults/addons/GPGCheck
192     -/etc/e-smith/db/yum_repositories/defaults/addons/EnableGroups
193     -/etc/e-smith/db/yum_repositories/defaults/addons/Visible
194     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeos
195     -/etc/e-smith/db/yum_repositories/defaults/smeos/type
196     -/etc/e-smith/db/yum_repositories/defaults/smeos/BaseURL
197     -/etc/e-smith/db/yum_repositories/defaults/smeos/status
198     -/etc/e-smith/db/yum_repositories/defaults/smeos/Name
199     -/etc/e-smith/db/yum_repositories/defaults/smeos/GPGCheck
200     -/etc/e-smith/db/yum_repositories/defaults/smeos/EnableGroups
201     -/etc/e-smith/db/yum_repositories/defaults/smeos/Visible
202     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeaddons
203     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/type
204     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/BaseURL
205     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/status
206     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/Name
207     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/GPGCheck
208     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/EnableGroups
209     -/etc/e-smith/db/yum_repositories/defaults/smeaddons/Visible
210     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smeupdates-testing
211     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/type
212     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/BaseURL
213     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/status
214     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/Name
215     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/GPGCheck
216     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/EnableGroups
217     -/etc/e-smith/db/yum_repositories/defaults/smeupdates-testing/Visible
218     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/testing
219     -/etc/e-smith/db/yum_repositories/defaults/testing/type
220     -/etc/e-smith/db/yum_repositories/defaults/testing/BaseURL
221     -/etc/e-smith/db/yum_repositories/defaults/testing/status
222     -/etc/e-smith/db/yum_repositories/defaults/testing/Name
223     -/etc/e-smith/db/yum_repositories/defaults/testing/GPGCheck
224     -/etc/e-smith/db/yum_repositories/defaults/testing/EnableGroups
225     -/etc/e-smith/db/yum_repositories/defaults/testing/Visible
226     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smetest
227     -/etc/e-smith/db/yum_repositories/defaults/smetest/type
228     -/etc/e-smith/db/yum_repositories/defaults/smetest/BaseURL
229     -/etc/e-smith/db/yum_repositories/defaults/smetest/status
230     -/etc/e-smith/db/yum_repositories/defaults/smetest/Name
231     -/etc/e-smith/db/yum_repositories/defaults/smetest/GPGCheck
232     -/etc/e-smith/db/yum_repositories/defaults/smetest/EnableGroups
233     -/etc/e-smith/db/yum_repositories/defaults/smetest/Visible
234     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_repositories/defaults/smedev
235     -/etc/e-smith/db/yum_repositories/defaults/smedev/type
236     -/etc/e-smith/db/yum_repositories/defaults/smedev/BaseURL
237     -/etc/e-smith/db/yum_repositories/defaults/smedev/status
238     -/etc/e-smith/db/yum_repositories/defaults/smedev/Name
239     -/etc/e-smith/db/yum_repositories/defaults/smedev/GPGCheck
240     -/etc/e-smith/db/yum_repositories/defaults/smedev/EnableGroups
241     -/etc/e-smith/db/yum_repositories/defaults/smedev/Visible
242     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_updates
243     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_available
244     -%dir %attr(0755,root,root) /etc/e-smith/db/yum_installed
245     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration
246     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults
247     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/defaults/yum
248     -/etc/e-smith/db/configuration/defaults/yum/type
249     -/etc/e-smith/db/configuration/defaults/yum/RandomDelay
250     -/etc/e-smith/db/configuration/defaults/yum/status
251     -/etc/e-smith/db/configuration/defaults/yum/GPGCheck
252     -/etc/e-smith/db/configuration/defaults/yum/PackageFunctions
253     -/etc/e-smith/db/configuration/defaults/yum/EnableGroups
254     -/etc/e-smith/db/configuration/defaults/yum/AutoInstallUpdates
255     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/force
256     -%dir %attr(0755,root,root) /etc/e-smith/db/configuration/force/yum
257     -/etc/e-smith/db/configuration/force/yum/AutoInstallUpdates
258     -%dir %attr(0755,root,root) /etc/e-smith/events
259     -%dir %attr(0755,root,root) /etc/e-smith/events/actions
260     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-import-keys
261     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-update-dbs
262     -%attr(0554,root,root) /etc/e-smith/events/actions/yum-action
263     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-remove
264     -/etc/e-smith/events/yum-remove/S50initialize-default-databases
265     -/etc/e-smith/events/yum-remove/S20yum-action
266     -/etc/e-smith/events/yum-remove/S90yum-update-dbs
267     -/etc/e-smith/events/yum-remove/S80navigation-conf
268     -%dir %attr(0755,root,root) /etc/e-smith/events/local
269     -/etc/e-smith/events/local/S90yum-update-dbs
270     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save
271     -/etc/e-smith/events/bootstrap-console-save/S10yum-import-keys
272     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand
273     -%dir %attr(0755,root,root) /etc/e-smith/events/bootstrap-console-save/templates2expand/etc
274     -/etc/e-smith/events/bootstrap-console-save/templates2expand/etc/yum.conf
275     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify
276     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify/templates2expand
277     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-modify/templates2expand/etc
278     -/etc/e-smith/events/yum-modify/templates2expand/etc/yum.conf
279     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-install
280     -/etc/e-smith/events/yum-install/S50initialize-default-databases
281     -/etc/e-smith/events/yum-install/S20yum-action
282     -/etc/e-smith/events/yum-install/S90yum-update-dbs
283     -/etc/e-smith/events/yum-install/S80navigation-conf
284     -%dir %attr(0755,root,root) /etc/e-smith/events/yum-update
285     -/etc/e-smith/events/yum-update/S50initialize-default-databases
286     -/etc/e-smith/events/yum-update/S20yum-action
287     -/etc/e-smith/events/yum-update/S90yum-update-dbs
288     -/etc/e-smith/events/yum-update/S80navigation-conf
289     -%dir %attr(0755,root,root) /var/service
290     -%dir %attr(0755,root,root) /var/service/yum
291     -%attr(0644,root,root) /var/service/yum/down
292     -%attr(0755,root,root) /var/service/yum/run
293     -%dir %attr(0700,root,root) /var/service/yum/supervise
294     -%dir %attr(0755,root,root) /var/service/yum/log
295     -%attr(0755,root,root) /var/service/yum/log/run
296     -%dir %attr(0700,root,root) /var/service/yum/log/supervise
297     -%dir %attr(2750,smelog,smelog) /var/log/yum
298     -%dir %attr(0755,root,root) /sbin/e-smith
299     -%attr(0755,root,root) /sbin/e-smith/yum
300     -%attr(0700,root,root) /sbin/e-smith/yum_update_dbs
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed