Handle partial reroll of series without cover

A series may not have a cover letter, so properly handle that situation.

Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>

2 files changed, 5 insertions, 0 deletions

diff --git a/b4/__init__.py b/b4/__init__.py
index fc79e7f..eed101a 100644
--- a/b4/__init__.py
+++ b/b4/__init__.py
@@ -273,6 +273,9 @@ class LoreMailbox:
         logger.debug('Reconstituting a partial reroll')
         at = 0
         for patch in lser.patches:
+            if pser.patches[at] is None:
+                at += 1
+                continue
             if patch is None:
                 ppatch = copy.deepcopy(pser.patches[at])
                 ppatch.revision = lser.revision
diff --git a/b4/mbox.py b/b4/mbox.py
index de2cfc6..55b456a 100644
--- a/b4/mbox.py
+++ b/b4/mbox.py
@@ -577,6 +577,8 @@ def main(cmdargs):
                 if not len(msgs):
                     logger.critical('Could not find %s in %s', msgid, cmdargs.localmbox)
                     sys.exit(1)
+            else:
+                msgs = in_mbx
         else:
             logger.critical('Mailbox %s does not exist', cmdargs.localmbox)
             sys.exit(1)