repoman: don't complain about stray Manifests.

As repoman regenerates and readds Manifests anyway, there's no reason to
complain when one hasn't been added yet.

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index a07b4a43634e3be397da0a418c16bb31b18892cf..acecd79829704db3389803ddc19e9b1b19772f80 100644 (file)
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -73,6 +73,9 @@ def detect_vcs_conflicts(options, vcs):
                        if not line:
                                continue
                        if line[0] not in "UPMARD": # Updates,Patches,Modified,Added,Removed/Replaced(svn),Deleted(svn)
+                               # Stray Manifest is fine, we will readd it anyway.
+                               if line[0] == '?' and line[1:].lstrip() == 'Manifest':
+                                       continue
                                logging.error(red("!!! Please fix the following issues reported " + \
                                        "from cvs: ")+green("(U,P,M,A,R,D are ok)"))
                                logging.error(red("!!! Note: This is a pretend/no-modify pass..."))