@@ -75,7 +75,7 @@ def __init__(self, name, init_config, instances):
7575 'excluded_filesystems' : 'file_system_exclude' ,
7676 'excluded_disks' : 'device_exclude' ,
7777 'excluded_disk_re' : 'device_exclude' ,
78- 'excluded_mountpoint_re' : 'mountpoint_exclude ' ,
78+ 'excluded_mountpoint_re' : 'mount_point_exclude ' ,
7979 }
8080 for old_name , new_name in deprecations .items ():
8181 if instance .get ('old_name' ):
@@ -184,55 +184,55 @@ def _exclude_disk(self, device, file_system, mount_point):
184184 # account a space might be in the mount point.
185185 mount_point = mount_point .rsplit (' ' , 1 )[0 ]
186186
187- return self ._partition_excludeed (device , file_system , mount_point ) or not self ._partition_includeed (
187+ return self ._partition_excluded (device , file_system , mount_point ) or not self ._partition_included (
188188 device , file_system , mount_point
189189 )
190190
191- def _partition_includeed (self , device , file_system , mount_point ):
191+ def _partition_included (self , device , file_system , mount_point ):
192192 return (
193- self ._file_system_includeed (file_system )
194- and self ._device_includeed (device )
195- and self ._mount_point_includeed (mount_point )
193+ self . (file_system )
194+ and self ._device_included (device )
195+ and self ._mount_point_included (mount_point )
196196 )
197197
198- def _partition_excludeed (self , device , file_system , mount_point ):
198+ def _partition_excluded (self , device , file_system , mount_point ):
199199 return (
200- self ._file_system_excludeed (file_system )
201- or self ._device_excludeed (device )
202- or self ._mount_point_excludeed (mount_point )
200+ self ._file_system_excluded (file_system )
201+ or self ._device_excluded (device )
202+ or self ._mount_point_excluded (mount_point )
203203 )
204204
205- def _file_system_includeed (self , file_system ):
205+ def _file_system_included (self , file_system ):
206206 if self ._file_system_include is None :
207207 return True
208208
209209 return not not self ._file_system_include .match (file_system )
210210
211- def _file_system_excludeed (self , file_system ):
211+ def _file_system_excluded (self , file_system ):
212212 if self ._file_system_exclude is None :
213213 return False
214214
215215 return not not self ._file_system_exclude .match (file_system )
216216
217- def _device_includeed (self , device ):
217+ def _device_included (self , device ):
218218 if not device or self ._device_include is None :
219219 return True
220220
221221 return not not self ._device_include .match (device )
222222
223- def _device_excludeed (self , device ):
223+ def _device_excluded (self , device ):
224224 if not device or self ._device_exclude is None :
225225 return False
226226
227227 return not not self ._device_exclude .match (device )
228228
229- def _mount_point_includeed (self , mount_point ):
229+ def _mount_point_included (self , mount_point ):
230230 if self ._mount_point_include is None :
231231 return True
232232
233233 return not not self ._mount_point_include .match (mount_point )
234234
235- def _mount_point_excludeed (self , mount_point ):
235+ def _mount_point_excluded (self , mount_point ):
236236 if self ._mount_point_exclude is None :
237237 return False
238238
0 commit comments