Fix branch dir search by not aborting when seeing a directory twice

Instead, simply clear the list of subdirs to recurse into and
continue. Also make the filtering of hidden subdirectories a
one-liner.

1 files changed, 3 insertions, 4 deletions

diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 829176fa..ea9b67a8 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -84,7 +84,8 @@ class BranchAndMergePlugin(cliapp.Plugin):
         for dirname, subdirs, files in os.walk(os.getcwd(), followlinks=True):
             # Avoid infinite recursion.
             if dirname in visited:
-                break
+                subdirs[:] = []
+                continue
             visited.add(dirname)
 
             if cls.is_system_branch_directory(dirname):
@@ -92,9 +93,7 @@ class BranchAndMergePlugin(cliapp.Plugin):
 
             # Do not recurse deeper if we have more than one
             # non-hidden directory.
-            for d in copy.copy(subdirs):
-                if d.startswith('.'):
-                    subdirs.remove(d)
+            subdirs[:] = [x for x in subdirs if not x.startswith('.')]
             if len(subdirs) > 1:
                 break