← Back to branch summary

~ubuntu-branches/ubuntu/lucid/apparmor/lucid

« back to all changes in this revision

Viewing changes to parser/parser_lex.l

  • Committer: Bazaar Package Importer
  • Author(s): Kees Cook
  • Date: 2010-02-17 13:36:21 UTC
  • mfrom: (1.1.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20100217133621-uwk0niwtcie5mj1h
Tags: 2.5~pre+bzr1364-0ubuntu1
* Update to upstream bzr revision 1364.
* debian/apparmor.functions: ignore .dpkg-bak files when loading too.

Show diffs side-by-side

added added

removed removed

Lines of Context:
parser/parser_lex.l
63
63
        { ".dpkg-new", 9, 1 },
64
64
        { ".dpkg-old", 9, 1 },
65
65
        { ".dpkg-dist", 10, 1 },
 
66
        { ".dpkg-bak", 9, 1 },
66
67
        /* RPM packaging files have traditionally not been silently
67
68
           ignored */
68
69
        { ".rpmnew", 7, 0 },