* correct the locales subdir regex to capture only correct names.
git-svn-id: svn+ssh://rpmlint.zarb.org/home/projects/rpmlint/svn/trunk@87 9bc8b190-ac0f-0410-8968-dc7d1f502856
This commit is contained in:
parent
ea5f72f657
commit
7dc59d0470
|
@ -32,7 +32,7 @@ EXCEPTION_DIRS=('C', 'POSIX', 'iso88591', 'iso8859')
|
||||||
|
|
||||||
class I18NCheck(AbstractCheck.AbstractCheck):
|
class I18NCheck(AbstractCheck.AbstractCheck):
|
||||||
locale_regex=re.compile("^(/usr/share/locale/([^/]+))/")
|
locale_regex=re.compile("^(/usr/share/locale/([^/]+))/")
|
||||||
correct_subdir_regex=re.compile("^([a-z][a-z]($|_[A-Z][A-Z])(\..*$)?)")
|
correct_subdir_regex=re.compile("^(([a-z][a-z](_[A-Z][A-Z])?)([.@].*$)?)$")
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
AbstractCheck.AbstractCheck.__init__(self, "I18NCheck")
|
AbstractCheck.AbstractCheck.__init__(self, "I18NCheck")
|
||||||
|
@ -56,15 +56,13 @@ class I18NCheck(AbstractCheck.AbstractCheck):
|
||||||
locale=res.group(2)
|
locale=res.group(2)
|
||||||
# checks the same locale only once
|
# checks the same locale only once
|
||||||
if not locale in locales:
|
if not locale in locales:
|
||||||
#print pkg.name, locale
|
|
||||||
locales.append(locale)
|
locales.append(locale)
|
||||||
res2=I18NCheck.correct_subdir_regex.search(locale)
|
res2=I18NCheck.correct_subdir_regex.search(locale)
|
||||||
if not res2:
|
if not res2:
|
||||||
if not locale in EXCEPTION_DIRS:
|
if not locale in EXCEPTION_DIRS:
|
||||||
printError(pkg, "incorrect-locale-subdir", f)
|
printError(pkg, "incorrect-locale-subdir", f)
|
||||||
else:
|
else:
|
||||||
locale_name = res2.group(1)
|
locale_name = res2.group(2)
|
||||||
#print "name=", locale_name
|
|
||||||
try:
|
try:
|
||||||
correct=INCORRECT_LOCALES[locale_name]
|
correct=INCORRECT_LOCALES[locale_name]
|
||||||
printError(pkg, "incorrect-locale-" + correct, f)
|
printError(pkg, "incorrect-locale-" + correct, f)
|
||||||
|
|
Loading…
Reference in New Issue