Merge lp:~jelmer/brz/find-controldirs-ignore-unknownformat into lp:brz

[Jelmer Vernooij]

Ignore UnknownFormatError in ControlDir.find_controldirs

Ignore UnknownFormatError in ControlDir.find_controldirs

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2019-06-18 11:21:15 +0000
+++ breezy/controldir.py	2019-06-27 00:45:45 +0000
@@ -561,7 +561,8 @@
             recurse = True
             try:
                 controldir = klass.open_from_transport(current_transport)
-            except (errors.NotBranchError, errors.PermissionDenied):
+            except (errors.NotBranchError, errors.PermissionDenied,
+                    errors.UnknownFormatError):
                 pass
             else:
                 recurse, value = evaluate(controldir)

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2019-06-22 11:51:56 +0000
+++ doc/en/release-notes/brz-3.1.txt	2019-06-27 00:45:45 +0000
@@ -64,6 +64,9 @@
   (i.e. when a non-int is specified as the value for an integer
   parameter) (#237844, Jelmer Vernooij)
 
+* Ignore UnknownFormatErrors when scanning for control directories.
+  (Jelmer Vernooij, #468332)
+
 Documentation
 *************