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 8FD57139BC6 for ; Thu, 17 Sep 2015 18:58:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18159E0898; Thu, 17 Sep 2015 18:58:34 +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 8C585E0898 for ; Thu, 17 Sep 2015 18:58:33 +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 4CDEA340A66 for ; Thu, 17 Sep 2015 18:58:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05EFA18F for ; Thu, 17 Sep 2015 18:58:30 +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: <1442514712.1ebdd23d99326330e3b3bda4245b578b5bbf2874.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/scanner.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1ebdd23d99326330e3b3bda4245b578b5bbf2874 X-VCS-Branch: repoman Date: Thu, 17 Sep 2015 18:58:30 +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: 15a41b61-7a0f-4f79-be36-3d2081af9cd0 X-Archives-Hash: 590ba9e555ec223dcfa6f2c66bf0a7ff commit: 1ebdd23d99326330e3b3bda4245b578b5bbf2874 Author: Brian Dolbec gentoo org> AuthorDate: Thu Sep 17 18:31:52 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Thu Sep 17 18:31:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=1ebdd23d repoman/scanner.py: Clean out code separation demarcation lines These lines were originally used to mark places where code was removed. And replaced with a class instance and/or function call. Signed-off-by: Brian Dolbec gentoo.org> pym/repoman/scanner.py | 61 ++++++-------------------------------------------- 1 file changed, 7 insertions(+), 54 deletions(-) diff --git a/pym/repoman/scanner.py b/pym/repoman/scanner.py index 781461f..240c949 100644 --- a/pym/repoman/scanner.py +++ b/pym/repoman/scanner.py @@ -91,13 +91,10 @@ class Scanner(object): self.reposplit = myreporoot.split(os.path.sep) self.repolevel = len(self.reposplit) - ################### if self.options.mode == 'commit': repochecks.commit_check(self.repolevel, self.reposplit) repochecks.conflict_check(self.vcs_settings, self.options) - ################### - # Make startdir relative to the canonical repodir, so that we can pass # it to digestgen and it won't have to be canonicalized again. if self.repolevel == 1: @@ -106,8 +103,6 @@ class Scanner(object): startdir = normalize_path(mydir) startdir = os.path.join( self.repo_settings.repodir, *startdir.split(os.sep)[-2 - self.repolevel + 3:]) - ################### - # get lists of valid keywords, licenses, and use new_data = repo_metadata(self.portdb, self.repo_settings.repoman_settings) @@ -125,20 +120,12 @@ class Scanner(object): self.repo_settings.repoman_settings['PORTAGE_ARCHLIST'] = ' '.join(sorted(kwlist)) self.repo_settings.repoman_settings.backup_changes('PORTAGE_ARCHLIST') - #################### - self.profiles = setup_profile(profile_list) - #################### - check_profiles(self.profiles, self.repo_settings.repoman_settings.archlist()) - #################### - scanlist = scan(self.repolevel, self.reposplit, startdir, self.categories, self.repo_settings) - #################### - self.dev_keywords = dev_profile_keywords(self.profiles) self.qatracker = QATracker() @@ -170,13 +157,9 @@ class Scanner(object): else: print(green("\nRepoMan scours the neighborhood...")) - ##################### - self.changed = Changes(self.options) self.changed.scan(self.vcs_settings) - ###################### - self.have = { 'pmasked': False, 'dev_keywords': False, @@ -197,7 +180,6 @@ class Scanner(object): # Disable the "ebuild.notadded" check when not in commit mode and # running `svn status` in every package dir will be too expensive. - self.check['ebuild_notadded'] = not \ (self.vcs_settings.vcs == "svn" and self.repolevel < 3 and self.options.mode != "commit") @@ -209,7 +191,6 @@ class Scanner(object): self.live_eclasses = portage.const.LIVE_ECLASSES - ###################### # initialize our checks classes here before the big xpkg loop self.manifester = Manifests(self.options, self.qatracker, self.repo_settings.repoman_settings) self.is_ebuild = IsEbuild(self.repo_settings.repoman_settings, self.repo_settings, self.portdb, self.qatracker) @@ -228,8 +209,6 @@ class Scanner(object): self.descriptioncheck = DescriptionChecks(self.qatracker) self.licensecheck = LicenseChecks(self.qatracker, liclist, liclist_deprecated) self.restrictcheck = RestrictChecks(self.qatracker) - ###################### - def scan(self): @@ -248,19 +227,15 @@ class Scanner(object): checkdir_relative = os.path.join(catdir, checkdir_relative) checkdir_relative = os.path.join(".", checkdir_relative) - ##################### if self.manifester.run(checkdir, self.portdb): continue if not self.manifester.generated_manifest: self.manifester.digest_check(xpkg, checkdir) - ###################### - if self.options.mode == 'manifest-check': continue checkdirlist = os.listdir(checkdir) - ###################### pkgs, allvalid = self.is_ebuild.check(checkdirlist, checkdir, xpkg) if self.is_ebuild.continue_: # If we can't access all the metadata then it's totally unsafe to @@ -270,31 +245,27 @@ class Scanner(object): # positives confuse users. self.can_force = False continue - ###################### self.keywordcheck.prepare() # Sort ebuilds in ascending order for the KEYWORDS.dropped check. ebuildlist = sorted(pkgs.values()) ebuildlist = [pkg.pf for pkg in ebuildlist] - ####################### + self.filescheck.check( checkdir, checkdirlist, checkdir_relative, self.changed.changed, self.changed.new) - ####################### + self.status_check.check(self.check['ebuild_notadded'], checkdir, checkdir_relative, xpkg) eadded.extend(self.status_check.eadded) - ################# self.fetchcheck.check( xpkg, checkdir, checkdir_relative, self.changed.changed, self.changed.new) - ################# if self.check['changelog'] and "ChangeLog" not in checkdirlist: self.qatracker.add_error("changelog.missing", xpkg + "/ChangeLog") - ################# + self.pkgmeta.check(xpkg, checkdir, checkdirlist, self.repolevel) muselist = frozenset(self.pkgmeta.musedict) - ################# changelog_path = os.path.join(checkdir_relative, "ChangeLog") changelog_modified = changelog_path in self.changed.changelogs @@ -303,11 +274,10 @@ class Scanner(object): used_useflags = set() for y_ebuild in ebuildlist: - ################## + ebuild = Ebuild( self.repo_settings, self.repolevel, pkgdir, catdir, self.vcs_settings, xpkg, y_ebuild) - ################## if self.check['changelog'] and not changelog_modified \ and ebuild.ebuild_path in self.changed.new_ebuilds: @@ -318,10 +288,9 @@ class Scanner(object): self.qatracker.add_error( "ebuild.notadded", xpkg + "/" + y_ebuild + ".ebuild") - ################## if bad_split_check(xpkg, y_ebuild, pkgdir, self.qatracker): continue - ################### + pkg = pkgs[y_ebuild] if pkg_invalid(pkg, self.qatracker, ebuild): allvalid = False @@ -332,9 +301,7 @@ class Scanner(object): inherited = pkg.inherited live_ebuild = self.live_eclasses.intersection(inherited) - ####################### self.eapicheck.check(pkg, ebuild) - ####################### for k, v in myaux.items(): if not isinstance(v, basestring): @@ -348,9 +315,8 @@ class Scanner(object): (ebuild.relative_path, k, m.start() + 1)) if not self.fetchcheck.src_uri_error: - ####################### self.thirdparty.check(myaux, ebuild.relative_path) - ####################### + if myaux.get("PROVIDE"): self.qatracker.add_error("virtual.oldstyle", ebuild.relative_path) @@ -370,26 +336,20 @@ class Scanner(object): myqakey = var + ".virtual" self.qatracker.add_error(myqakey, ebuild.relative_path) - ####################### self.descriptioncheck.check(pkg, ebuild) - ####################### keywords = myaux["KEYWORDS"].split() ebuild_archs = set( kw.lstrip("~") for kw in keywords if not kw.startswith("-")) - ####################### self.keywordcheck.check( pkg, xpkg, ebuild, y_ebuild, keywords, ebuild_archs, self.changed, live_ebuild, self.repo_metadata['kwlist'], self.profiles) - ####################### if live_ebuild and self.repo_settings.repo_config.name == "gentoo": - ####################### self.liveeclasscheck.check( pkg, xpkg, ebuild, y_ebuild, keywords, self.repo_metadata['pmaskdict']) - ####################### if self.options.ignore_arches: arches = [[ @@ -540,27 +500,20 @@ class Scanner(object): badlicsyntax = badlicsyntax > 0 badprovsyntax = badprovsyntax > 0 - ################# self.use_flag_checks.check(pkg, xpkg, ebuild, y_ebuild, muselist) ebuild_used_useflags = self.use_flag_checks.getUsedUseFlags() used_useflags = used_useflags.union(ebuild_used_useflags) - ################# + self.rubyeclasscheck.check(pkg, ebuild) - ################# # license checks if not badlicsyntax: - ################# self.licensecheck.check(pkg, xpkg, ebuild, y_ebuild) - ################# - ################# self.restrictcheck.check(pkg, xpkg, ebuild, y_ebuild) - ################# # Syntax Checks - if not self.vcs_settings.vcs_preserves_mtime: if ebuild.ebuild_path not in self.changed.new_ebuilds and \ ebuild.ebuild_path not in self.changed.ebuilds: