| 1 |
commit: 514a4cf4426721eedf482047b0dc0b56fa2e71ca |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 30 16:40:05 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 30 16:40:31 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=514a4cf4 |
| 7 |
|
| 8 |
repoman: Fix commit af88402104c logic for the rewrite code |
| 9 |
|
| 10 |
The logic was opposite for what the new code needed. |
| 11 |
The original code skipped the scan for that logic, this code does the scan. |
| 12 |
X-Gentoo-Bug: 540882 |
| 13 |
|
| 14 |
Commit: af88402104c90e99ab40bff956f58395ea362a6e |
| 15 |
Author: Brian Dolbec <dolsen <AT> gentoo.org> (Wed 27 Jan 2016 12:32:47 PM PST) |
| 16 |
Subject: repoman: Re-add an if that bypasses the changes scan (bug 540882) |
| 17 |
|
| 18 |
pym/repoman/scanner.py | 4 ++-- |
| 19 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 |
|
| 21 |
diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py |
| 22 |
index 04d8b29..84dbdf2 100644 |
| 23 |
--- a/pym/repoman/scanner.py |
| 24 |
+++ b/pym/repoman/scanner.py |
| 25 |
@@ -172,8 +172,8 @@ class Scanner(object): |
| 26 |
|
| 27 |
self.changed = Changes(self.options) |
| 28 |
# bypass unneeded VCS operations if not needed |
| 29 |
- if (self.options.if_modified != "y" and |
| 30 |
- self.options.mode in ("manifest", "manifest-check")): |
| 31 |
+ if (self.options.if_modified == "y" or |
| 32 |
+ self.options.mode not in ("manifest", "manifest-check")): |
| 33 |
self.changed.scan(self.vcs_settings) |
| 34 |
|
| 35 |
self.have = { |
Archives