Merge remote branch 'drkranz/master' into merge

* drkranz/master:
  Adjust regex

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --combined tools/logs.py
index 182cdbdd234fb44766f60f67c2eb46592189ef5d,6db78d99e208a53ffe16263ac629cf53ea79e796..2ebb5bc4d722595d7a699001bbe7ada51fc22ee9
--- 1/tools/logs.py
--- 2/tools/logs.py
+++ b/tools/logs.py
@@@ -14,7 -14,7 +14,7 @@@ LINE = re.compile(r'(?:|.*/)dinstall_(\
                    r'Archive maintenance timestamp \(([^\)]*)\): (\d{2}):(\d{2}):(\d{2})$')
  UNSAFE = re.compile(r'[^a-zA-Z/\._:0-9\- ]')
  
 -graphs = {"dinstall1": {"keystolist":["pg_dump1", "i18n 1", "accepted", "make-suite-file-list", "apt-ftparchive",
 +graphs = {"dinstall1": {"keystolist":["pg_dump1", "i18n 1", "accepted", "dominate", "generate-filelist", "apt-ftparchive",
                                      "pdiff", "release files", "w-b", "i18n 2", "apt-ftparchive cleanup"],
                          "showothers":True},
            "dinstall2": {"keystolist":['External Updates', 'p-u-new', 'o-p-u-new', 'cruft', 'import-keyring', 'overrides', 'cleanup', 'scripts', 'mirror hardlinks', 'stats', 'compress', "pkg-file-mapping" ],
@@@ -46,7 -46,7 +46,7 @@@ if m
      raise Exception("I don't like command line arguments including char '%s'"%m.group(0))
  
  if args:
-   for l in os.popen('bzgrep -H "Archive maintenance timestamp" "'+'" "'.join(args)+'"'):
+   for l in os.popen('bzgrep -H "^Archive maintenance timestamp" "'+'" "'.join(args)+'"'):
      m = LINE.match(l)
      if not m:
          raise Exception("woops '%s'"%l)