commit: 73e780a802ba843d5778be44c81644a9f909a7bf
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 15:00:12 2014 +0000
Commit: Tom Wijsman <tomwij <AT> gentoo <DOT> org>
CommitDate: Mon Jun 2 15:00:12 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=73e780a8
repoman: Fix up files check's changeset variable propagation
---
pym/repoman/checks/directories/files.py | 6 ++++--
pym/repoman/main.py | 10 ++++++----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/pym/repoman/checks/directories/files.py
b/pym/repoman/checks/directories/files.py
index 62f6169..71c01d0 100644
--- a/pym/repoman/checks/directories/files.py
+++ b/pym/repoman/checks/directories/files.py
@@ -28,7 +28,7 @@ class FileChecks(object):
self.vcs_new_changed = vcs_new_changed
- def check(self, checkdir, checkdirlist, checkdir_relative):
+ def check(self, checkdir, checkdirlist, checkdir_relative, changed,
new):
'''Checks the ebuild sources and files for errors
@param xpkg: the pacakge being checked
@@ -39,7 +39,9 @@ class FileChecks(object):
index =
self.repo_settings.repo_config.find_invalid_path_char(y_file)
if index != -1:
y_relative = os.path.join(checkdir_relative,
y_file)
- if self.vcs_settings.vcs is not None and not
self.vcs_new_changed(y_relative):
+ invcs = self.vcs_settings.vcs is not None
+ inchangeset = self.vcs_new_changed(y_relative,
changed, new)
+ if invcs and not inchangeset:
# If the file isn't in the VCS new or
changed set, then
# assume that it's an irrelevant
temporary file (Manifest
# entries are not generated for file
names containing
diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index c5a6ea6..90cf85b 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -315,10 +315,6 @@ for xpkg in effective_scanlist:
ebuildlist = sorted(pkgs.values())
ebuildlist = [pkg.pf for pkg in ebuildlist]
#######################
- filescheck = FileChecks(qatracker, repoman_settings, repo_settings,
portdb,
- vcs_settings, vcs_new_changed)
- filescheck.check(checkdir, checkdirlist, checkdir_relative)
-#######################
status_check = VCSStatus(vcs_settings, checkdir, checkdir_relative,
xpkg, qatracker)
status_check.check(check_ebuild_notadded)
eadded.extend(status_check.eadded)
@@ -1220,6 +1216,12 @@ else:
print()
sys.exit(1)
+ #######################
+ filescheck = FileChecks(qatracker, repoman_settings, repo_settings,
portdb,
+ vcs_settings, vcs_new_changed)
+ filescheck.check(checkdir, checkdirlist, checkdir_relative, mychanged,
mynew)
+ #######################
+
# Manifests need to be regenerated after all other commits, so don't
commit
# them now even if they have changed.
mymanifests = set()
