[gentoo-commits] proj/portage:master commit in: pym/repoman/

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     514a4cf4426721eedf482047b0dc0b56fa2e71ca
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 16:40:05 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 16:40:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=514a4cf4

repoman: Fix commit af88402104c logic for the rewrite code

The logic was opposite for what the new code needed.
The original code skipped the scan for that logic, this code does the scan.
X-Gentoo-Bug: 540882

Commit: af88402104c90e99ab40bff956f58395ea362a6e
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 27 Jan 2016 12:32:47 PM PST)
Subject: repoman: Re-add an if that bypasses the changes scan (bug 540882)

 pym/repoman/scanner.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py
index 04d8b29..84dbdf2 100644
--- a/pym/repoman/scanner.py
+++ b/pym/repoman/scanner.py
@@ -172,8 +172,8 @@ class Scanner(object):
 
 		self.changed = Changes(self.options)
 		# bypass unneeded VCS operations if not needed
-		if (self.options.if_modified != "y" and
-			self.options.mode in ("manifest", "manifest-check")):
+		if (self.options.if_modified == "y" or
+			self.options.mode not in ("manifest", "manifest-check")):
 			self.changed.scan(self.vcs_settings)
 
 		self.have = {