diff options
| author |   Michał Górny <gentoo@mgorny.alt.pl> | 2010-07-12 14:24:00 +0200 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2010-07-12 06:20:11 -0700 |
| commit | 564d825b286a23dc4171406297aff3929b86aaa1 (patch) | |
| tree | 302551c1378f8c5efc6553e8c22df37995ee8c40 /pym/repoman | |
| parent | Fix output handling for FEATURES="lafilefixing". (diff) | |
| download | portage-multirepo-564d825b286a23dc4171406297aff3929b86aaa1.tar.gz portage-multirepo-564d825b286a23dc4171406297aff3929b86aaa1.tar.bz2 portage-multirepo-564d825b286a23dc4171406297aff3929b86aaa1.zip | |
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.
Diffstat (limited to 'pym/repoman')
| -rw-r--r-- | pym/repoman/utilities.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index a07b4a43..acecd798 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...")) |