From: Michał Górny <gentoo@mgorny.alt.pl>
Date: Mon, 12 Jul 2010 12:24:00 +0000 (+0200)
Subject: repoman: don't complain about stray Manifests.
X-Git-Tag: v2.2_rc68~511
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=564d825b286a23dc4171406297aff3929b86aaa1;p=portage.git

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 a07b4a436..acecd7982 100644
--- 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..."))