1 |
commit: 73e780a802ba843d5778be44c81644a9f909a7bf |
2 |
Author: Tom Wijsman <tomwij <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jun 2 15:00:12 2014 +0000 |
4 |
Commit: Tom Wijsman <tomwij <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 2 15:00:12 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=73e780a8 |
7 |
|
8 |
repoman: Fix up files check's changeset variable propagation |
9 |
|
10 |
--- |
11 |
pym/repoman/checks/directories/files.py | 6 ++++-- |
12 |
pym/repoman/main.py | 10 ++++++---- |
13 |
2 files changed, 10 insertions(+), 6 deletions(-) |
14 |
|
15 |
diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py |
16 |
index 62f6169..71c01d0 100644 |
17 |
--- a/pym/repoman/checks/directories/files.py |
18 |
+++ b/pym/repoman/checks/directories/files.py |
19 |
@@ -28,7 +28,7 @@ class FileChecks(object): |
20 |
self.vcs_new_changed = vcs_new_changed |
21 |
|
22 |
|
23 |
- def check(self, checkdir, checkdirlist, checkdir_relative): |
24 |
+ def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): |
25 |
'''Checks the ebuild sources and files for errors |
26 |
|
27 |
@param xpkg: the pacakge being checked |
28 |
@@ -39,7 +39,9 @@ class FileChecks(object): |
29 |
index = self.repo_settings.repo_config.find_invalid_path_char(y_file) |
30 |
if index != -1: |
31 |
y_relative = os.path.join(checkdir_relative, y_file) |
32 |
- if self.vcs_settings.vcs is not None and not self.vcs_new_changed(y_relative): |
33 |
+ invcs = self.vcs_settings.vcs is not None |
34 |
+ inchangeset = self.vcs_new_changed(y_relative, changed, new) |
35 |
+ if invcs and not inchangeset: |
36 |
# If the file isn't in the VCS new or changed set, then |
37 |
# assume that it's an irrelevant temporary file (Manifest |
38 |
# entries are not generated for file names containing |
39 |
|
40 |
diff --git a/pym/repoman/main.py b/pym/repoman/main.py |
41 |
index c5a6ea6..90cf85b 100755 |
42 |
--- a/pym/repoman/main.py |
43 |
+++ b/pym/repoman/main.py |
44 |
@@ -315,10 +315,6 @@ for xpkg in effective_scanlist: |
45 |
ebuildlist = sorted(pkgs.values()) |
46 |
ebuildlist = [pkg.pf for pkg in ebuildlist] |
47 |
####################### |
48 |
- filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb, |
49 |
- vcs_settings, vcs_new_changed) |
50 |
- filescheck.check(checkdir, checkdirlist, checkdir_relative) |
51 |
-####################### |
52 |
status_check = VCSStatus(vcs_settings, checkdir, checkdir_relative, xpkg, qatracker) |
53 |
status_check.check(check_ebuild_notadded) |
54 |
eadded.extend(status_check.eadded) |
55 |
@@ -1220,6 +1216,12 @@ else: |
56 |
print() |
57 |
sys.exit(1) |
58 |
|
59 |
+ ####################### |
60 |
+ filescheck = FileChecks(qatracker, repoman_settings, repo_settings, portdb, |
61 |
+ vcs_settings, vcs_new_changed) |
62 |
+ filescheck.check(checkdir, checkdirlist, checkdir_relative, mychanged, mynew) |
63 |
+ ####################### |
64 |
+ |
65 |
# Manifests need to be regenerated after all other commits, so don't commit |
66 |
# them now even if they have changed. |
67 |
mymanifests = set() |