mirror of
https://gitlab.com/apparmor/apparmor
synced 2025-09-01 23:05:11 +00:00
aa-mergeprof: fixup some of the whitespace issues
This commit is contained in:
@@ -34,6 +34,7 @@ args = parser.parse_args()
|
||||
|
||||
profiles = [args.mine, args.base, args.other]
|
||||
|
||||
|
||||
def main():
|
||||
mergeprofiles = Merge(profiles)
|
||||
#Get rid of common/superfluous stuff
|
||||
@@ -176,7 +177,6 @@ class Merge(object):
|
||||
options.pop(selected)
|
||||
apparmor.aa.UI_Info(_('Adding %s to the file.') % selection)
|
||||
|
||||
|
||||
sev_db = apparmor.aa.sev_db
|
||||
if not sev_db:
|
||||
sev_db = apparmor.severity.Severity(apparmor.aa.CONFDIR + '/severity.db', _('unknown'))
|
||||
@@ -674,8 +674,5 @@ class Merge(object):
|
||||
else:
|
||||
done = False
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
Reference in New Issue
Block a user