~sbeattie/apparmor-profile-tools/pre-merger-cleanups

« back to all changes in this revision

Viewing changes to apparmor/tools.py

  • Committer: kgupta8592 at gmail
  • Date: 2013-09-23 14:02:25 UTC
  • Revision ID: kgupta8592@gmail.com-20130923140225-ybc927gihm26kdqj
Added first version of aa-mergeprof, does not include the check for conflicting ix rules yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
123
123
                q = apparmor.hasher()
124
124
                q['title'] = 'Changed Local Profiles'
125
125
                q['headers'] = []
126
 
                q['explanation'] = _('The following local profiles were changed. Would you like to save them?')
 
126
                q['explanation'] = _('The local profile for %s in file %s was changed. Would you like to save it?') %(program, filename)
127
127
                q['functions'] = ['CMD_SAVE_CHANGES', 'CMD_VIEW_CHANGES', 'CMD_ABORT']
128
128
                q['default'] = 'CMD_VIEW_CHANGES'
129
129
                q['options'] = []