From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 40FDD1393E9 for ; Mon, 2 Jun 2014 15:44:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 94DADE0B42; Mon, 2 Jun 2014 15:44:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CFFE5E0B38 for ; Mon, 2 Jun 2014 15:44:25 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A7EB733FEFF for ; Mon, 2 Jun 2014 15:44:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 53358182D6 for ; Mon, 2 Jun 2014 15:44:23 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1401723771.4dab973e26b91724087899e2adfdf41a6add01ca.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/, pym/repoman/checks/directories/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/checks/directories/files.py pym/repoman/main.py X-VCS-Directories: pym/repoman/ pym/repoman/checks/directories/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 4dab973e26b91724087899e2adfdf41a6add01ca X-VCS-Branch: repoman Date: Mon, 2 Jun 2014 15:44:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2f1bbf8d-dbaf-4cec-b9ba-e93227232d83 X-Archives-Hash: d575f3dc5f8e9caf032bece5d5bdd25f commit: 4dab973e26b91724087899e2adfdf41a6add01ca Author: Tom Wijsman gentoo org> AuthorDate: Mon Jun 2 15:00:12 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Jun 2 15:42:51 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4dab973e 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 dfdf6ad..4f25adb 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -313,10 +313,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) @@ -1218,6 +1214,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()