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 236D213838B for ; Wed, 1 Oct 2014 23:02:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E608AE0850; Wed, 1 Oct 2014 23:02:36 +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 CBDAFE084F for ; Wed, 1 Oct 2014 23:02:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6D85034025F for ; Wed, 1 Oct 2014 23:02:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E218A6B53 for ; Wed, 1 Oct 2014 23:02:32 +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: <1412204237.f885ccc4dc4d19668a420793f9a5e5de11f9192e.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/checks/ebuilds/, pym/repoman/checks/directories/, pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/checks/directories/files.py pym/repoman/checks/ebuilds/fetches.py pym/repoman/main.py X-VCS-Directories: pym/repoman/ pym/repoman/checks/directories/ pym/repoman/checks/ebuilds/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: f885ccc4dc4d19668a420793f9a5e5de11f9192e X-VCS-Branch: repoman Date: Wed, 1 Oct 2014 23:02:32 +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: 7d07a343-9447-4c95-b459-fac774ad7986 X-Archives-Hash: 3b231b649420c61853dc4bdf0b3ec28d commit: f885ccc4dc4d19668a420793f9a5e5de11f9192e Author: Brian Dolbec gentoo org> AuthorDate: Mon Jun 2 15:27:32 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Wed Oct 1 22:57:17 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=f885ccc4 Repoman: Fix previous errors introduced I mistakenly used vcs_new_changed as a boolean value, passing it around to newly split out code. This corrects it's use to an imported function. This also correct the mychanged, mynew values that were moved to the Changes class. Reverse moving the filescheck to later in the code when mychanged, mynew was defined. Those were different vlaues than what was original for that check. commit: 73e780a802ba843d5778be44c81644a9f909a7bf Subject: repoman: Fix up files check's changeset variable propagation Author: Tom Wijsman gentoo.org> (Mon 02 Jun 2014 08:00:12 AM PDT) --- pym/repoman/checks/directories/files.py | 4 ++-- pym/repoman/checks/ebuilds/fetches.py | 9 +++++---- pym/repoman/main.py | 17 ++++++++--------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pym/repoman/checks/directories/files.py b/pym/repoman/checks/directories/files.py index 71c01d0..5dfca25 100644 --- a/pym/repoman/checks/directories/files.py +++ b/pym/repoman/checks/directories/files.py @@ -8,12 +8,13 @@ import io from portage import _encodings, _unicode_encode from portage import os +from repoman.vcs.vcs import vcs_new_changed class FileChecks(object): def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings, vcs_new_changed): + vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -25,7 +26,6 @@ class FileChecks(object): self.repo_settings = repo_settings self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - self.vcs_new_changed = vcs_new_changed def check(self, checkdir, checkdirlist, checkdir_relative, changed, new): diff --git a/pym/repoman/checks/ebuilds/fetches.py b/pym/repoman/checks/ebuilds/fetches.py index 3d59339..ccf9ff9 100644 --- a/pym/repoman/checks/ebuilds/fetches.py +++ b/pym/repoman/checks/ebuilds/fetches.py @@ -8,12 +8,14 @@ from stat import S_ISDIR import portage from portage import os +from repoman.vcs.vcs import vcs_new_changed + class FetchChecks(object): '''Performs checks on the files needed for the ebuild''' def __init__(self, qatracker, repoman_settings, repo_settings, portdb, - vcs_settings, vcs_new_changed): + vcs_settings): ''' @param qatracker: QATracker instance @param repoman_settings: settings instance @@ -25,11 +27,10 @@ class FetchChecks(object): self.repo_settings = repo_settings self.repoman_settings = repoman_settings self.vcs_settings = vcs_settings - self.vcs_new_changed = vcs_new_changed self._digests = None - def check(self, xpkg, checkdir, checkdir_relative): + def check(self, xpkg, checkdir, checkdir_relative, mychanged, mynew): '''Checks the ebuild sources and files for errors @param xpkg: the pacakge being checked @@ -108,7 +109,7 @@ class FetchChecks(object): index = self.repo_settings.repo_config.find_invalid_path_char(y) if index != -1: y_relative = os.path.join(checkdir_relative, "files", y) - if self.vcs_settings.vcs is not None and not self.vcs_new_changed(y_relative): + if self.vcs_settings.vcs is not None and not vcs_new_changed(y_relative, mychanged, mynew): # 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 3e0e847..583c538 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -67,7 +67,7 @@ from repoman.scan import Changes, scan from repoman._subprocess import repoman_popen, repoman_getstatusoutput from repoman import utilities from repoman.vcs.vcs import (git_supports_gpg_sign, vcs_files_to_cps, - vcs_new_changed, VCSSettings) + VCSSettings) from repoman.vcs.vcsstatus import VCSStatus @@ -314,14 +314,19 @@ 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) + filescheck.check(checkdir, checkdirlist, checkdir_relative, + changed.changed, changed.new) +####################### status_check = VCSStatus(vcs_settings, checkdir, checkdir_relative, xpkg, qatracker) status_check.check(check_ebuild_notadded) eadded.extend(status_check.eadded) ################# fetchcheck = FetchChecks(qatracker, repoman_settings, repo_settings, portdb, - vcs_settings, vcs_new_changed) - fetchcheck.check(xpkg, checkdir, checkdir_relative) + vcs_settings) + fetchcheck.check(xpkg, checkdir, checkdir_relative, changed.changed, changed.new) ################# if check_changelog and "ChangeLog" not in checkdirlist: @@ -1217,12 +1222,6 @@ 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()