mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
read_profile: rename active_profile parameter
... to is_active_profile to prevent confusion with active_profiles
This commit is contained in:
parent
0551be806e
commit
58664c106c
1 changed files with 2 additions and 2 deletions
|
@ -1656,7 +1656,7 @@ def read_inactive_profiles(skip_profiles=()):
|
||||||
read_profile(full_file, False)
|
read_profile(full_file, False)
|
||||||
|
|
||||||
|
|
||||||
def read_profile(file, active_profile, read_error_fatal=False):
|
def read_profile(file, is_active_profile, read_error_fatal=False):
|
||||||
data = None
|
data = None
|
||||||
try:
|
try:
|
||||||
with open_file_read(file) as f_in:
|
with open_file_read(file) as f_in:
|
||||||
|
@ -1681,7 +1681,7 @@ def read_profile(file, active_profile, read_error_fatal=False):
|
||||||
if not attachment and profile.startswith('/'):
|
if not attachment and profile.startswith('/'):
|
||||||
attachment = profile # use profile as name and attachment
|
attachment = profile # use profile as name and attachment
|
||||||
|
|
||||||
if active_profile:
|
if is_active_profile:
|
||||||
active_profiles.add_profile(filename, profile, attachment, profile_data[profile])
|
active_profiles.add_profile(filename, profile, attachment, profile_data[profile])
|
||||||
original_profiles.add_profile(filename, profile, attachment, deepcopy(profile_data[profile]))
|
original_profiles.add_profile(filename, profile, attachment, deepcopy(profile_data[profile]))
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Add table
Reference in a new issue