26 lines
1.2 KiB
Diff
26 lines
1.2 KiB
Diff
|
Index: InitScriptCheck.py
|
||
|
|
===================================================================
|
||
|
|
RCS file: /cooker/soft/rpmlint/InitScriptCheck.py,v
|
||
|
|
retrieving revision 1.14
|
||
|
|
diff -u -r1.14 InitScriptCheck.py
|
||
|
|
--- InitScriptCheck.py 15 Apr 2005 20:01:46 -0000 1.14
|
||
|
|
+++ InitScriptCheck.py 6 Jul 2005 14:19:22 -0000
|
||
|
|
@@ -17,7 +17,7 @@
|
||
|
|
|
||
|
|
rc_regex=re.compile('^/etc(/rc.d)?/init.d/')
|
||
|
|
chkconfig_content_regex=re.compile('# +chkconfig: +([-0-9]+) +[-0-9]+ +[-0-9]+', re.MULTILINE)
|
||
|
|
-subsys_regex=re.compile('/var/lock/subsys/([^/\n ]+)', re.MULTILINE)
|
||
|
|
+subsys_regex=re.compile('/var/lock/subsys/([^/"\'\n ]+)', re.MULTILINE)
|
||
|
|
chkconfig_regex=re.compile('^[^#]*(chkconfig|add-service|del-service)', re.MULTILINE)
|
||
|
|
status_regex=re.compile('^[^#]*status', re.MULTILINE)
|
||
|
|
reload_regex=re.compile('^[^#]*reload', re.MULTILINE)
|
||
|
|
@@ -86,7 +86,7 @@
|
||
|
|
error=1
|
||
|
|
if name[0] == '$':
|
||
|
|
value=Pkg.substitute_shell_vars(name, content)
|
||
|
|
- if value == basename:
|
||
|
|
+ if value == basename or value[0] == '$':
|
||
|
|
error=0
|
||
|
|
if error:
|
||
|
|
printError(pkg, 'incoherent-subsys', f, name)
|