Для переменной cl_splash_image_hash добавлен учёт изменений plymouth

develop 3.6.4.2
parent 003ff5d128
commit 226c4636bd

@ -416,7 +416,10 @@ class VariableClSplashImageHash(ReadonlyVariable):
Контрольные суммы изображений для splashutils Контрольные суммы изображений для splashutils
""" """
hash_files = ("/etc/splash/calculate/images/verbose.md5", hash_files = ("/etc/splash/calculate/images/verbose.md5",
"/etc/splash/calculate/images/silent.md5") "/etc/splash/calculate/images/silent.md5",
"/usr/share/plymouth/themes/calculate/boot.md5",
"/usr/share/plymouth/themes/calculate/boot/md5sum",
"/usr/share/plymouth/themes/calculate/calculate.plymouth")
cfg_files = "/etc/splash/calculate/*.cfg" cfg_files = "/etc/splash/calculate/*.cfg"
@ -426,7 +429,7 @@ class VariableClSplashImageHash(ReadonlyVariable):
def get_hash_data(self, sources): def get_hash_data(self, sources):
data = [] data = []
for fn in sources: for fn in sources:
data.append(readFile(fn) or "-") data.append(self.get_config_md5(fn))
for fn in glob.glob(self.cfg_files): for fn in glob.glob(self.cfg_files):
data.append(self.get_config_md5(fn)) data.append(self.get_config_md5(fn))
break break

Loading…
Cancel
Save