/[smeserver]/rpms/smeserver-yum/sme10/smeserver-yum-2.6.0-bz11507-navigation.patch
ViewVC logotype

Annotation of /rpms/smeserver-yum/sme10/smeserver-yum-2.6.0-bz11507-navigation.patch

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


Revision 1.1 - (hide annotations) (download)
Tue Mar 30 16:25:40 2021 UTC (3 years, 7 months ago) by jpp
Branch: MAIN
CVS Tags: smeserver-yum-2_6_0-57_el7_sme, smeserver-yum-2_6_0-54_el7_sme, smeserver-yum-2_6_0-56_el7_sme, smeserver-yum-2_6_0-53_el7_sme, smeserver-yum-2_6_0-60_el7_sme, smeserver-yum-2_6_0-59_el7_sme, smeserver-yum-2_6_0-58_el7_sme, smeserver-yum-2_6_0-55_el7_sme, smeserver-yum-2_6_0-52_el7_sme, smeserver-yum-2_6_0-62_el7_sme, smeserver-yum-2_6_0-61_el7_sme, smeserver-yum-2_6_0-64_el7_sme, smeserver-yum-2_6_0-63_el7_sme
* Tue Mar 30 2021 Jean-Philippe Pialasse <tests@pialasse.com> 2.6.0-52.sme
- run navigation-conf when a panel is installed [SME: 11507]

1 jpp 1.1 diff -Nur --no-dereference 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
2     --- smeserver-yum-2.6.0.old/root/usr/lib/yum-plugins/smeserver.py 2021-03-30 12:16:36.461000000 -0400
3     +++ smeserver-yum-2.6.0/root/usr/lib/yum-plugins/smeserver.py 2021-03-30 12:21:31.608000000 -0400
4     @@ -216,7 +216,7 @@
5     # thispo.dirlist thispo.ghostlist thispo.filelist
6     if "/etc/e-smith/web/panels/manager/cgi-bin" in thispo.dirlist:
7     log(" ==> pannel detected : adding navigation-conf")
8     - actionlist['S80navigation-conf']="../actions/navigation-conf"
9     + actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
10    
11     else:
12     if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale'):
13     @@ -351,7 +351,7 @@
14     # thispo.dirlist thispo.ghostlist thispo.filelist
15     if "/etc/e-smith/web/panels/manager/cgi-bin" in thispo.dirlist:
16     log(" ==> pannel detected : adding navigation-conf")
17     - actionlist['S80navigation-conf']="../actions/navigation-conf"
18     + actionlist['S80navigation-conf']="/etc/e-smith/events/actions/navigation-conf"
19    
20     else:
21     if (n.startswith('smeserver') or n.startswith('e-smith')) and not n.startswith('smeserver-locale') and not (n in removenorebootok):
22     @@ -401,18 +401,18 @@
23     if len(actionlist)>0:
24     print " Adding actions to execute"
25     for kactions in actionlist:
26     - log(" " + kactions)
27     if os.path.isfile(actionlist[kactions]):
28     + log(" " + kactions)
29     os.symlink(actionlist[kactions],'/etc/e-smith/events/temp/' + kactions)
30    
31     # fill it with our list of templates to expand
32     if len(templateslist)>0:
33     print " Adding templates to expand"
34     for ktemplates in templateslist:
35     - log(" " + ktemplates)
36     mytemplatedir = '/etc/e-smith/templates/' + ktemplates
37     mytemplatemeta = '/etc/e-smith/templates.metadata/' + ktemplates
38     if os.path.exists(mytemplatedir) or os.path.exists(mytemplatemeta):
39     + log(" " + ktemplates)
40     addtemplate2expand(ktemplates)
41    
42     if len(serviceslist)>0:

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