From 564d825b286a23dc4171406297aff3929b86aaa1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Mon, 12 Jul 2010 14:24:00 +0200 Subject: [PATCH] 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. --- pym/repoman/utilities.py | 3 +++ 1 file changed, 3 insertions(+) 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...")) -- 2.26.2