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 5391C1381FA for ; Fri, 30 May 2014 13:03:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF87BE088A; Fri, 30 May 2014 13:03:35 +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 31082E088A for ; Fri, 30 May 2014 13:03:35 +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 221B433FDC2 for ; Fri, 30 May 2014 13:03:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D7B03182D5 for ; Fri, 30 May 2014 13:03:31 +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: <1401395564.b3f8adf37c195420511ebe3849ea0dffe14bd270.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/main.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b3f8adf37c195420511ebe3849ea0dffe14bd270 X-VCS-Branch: repoman Date: Fri, 30 May 2014 13:03:31 +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: 2f262327-4e03-49ea-9333-e301992aef65 X-Archives-Hash: 475843719517cba4703239600c95d4bf commit: b3f8adf37c195420511ebe3849ea0dffe14bd270 Author: Brian Dolbec gentoo org> AuthorDate: Thu May 29 20:32:44 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Thu May 29 20:32:44 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b3f8adf3 repoman/main.py: Rename x variable in loop to xpkg This will help clarify what it is better. --- pym/repoman/main.py | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index 46cdefd..99238d9 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -321,14 +321,14 @@ if options.if_modified == "y": effective_scanlist = sorted(vcs_files_to_cps( chain(changed.changed, changed.new, changed.removed))) -for x in effective_scanlist: +for xpkg in effective_scanlist: # ebuilds and digests added to cvs respectively. - logging.info("checking package %s" % x) + logging.info("checking package %s" % xpkg) # save memory by discarding xmatch caches from previous package(s) arch_xmatch_caches.clear() eadded = [] - catdir, pkgdir = x.split("/") - checkdir = repo_settings.repodir + "/" + x + catdir, pkgdir = xpkg.split("/") + checkdir = repo_settings.repodir + "/" + xpkg checkdir_relative = "" if repolevel < 3: checkdir_relative = os.path.join(pkgdir, checkdir_relative) @@ -348,7 +348,7 @@ for x in effective_scanlist: repoman_settings['PORTAGE_QUIET'] = '1' if not portage.digestcheck([], repoman_settings, strict=1): stats["manifest.bad"] += 1 - fails["manifest.bad"].append(os.path.join(x, 'Manifest')) + fails["manifest.bad"].append(os.path.join(xpkg, 'Manifest')) repoman_settings.pop('PORTAGE_QUIET', None) if options.mode == 'manifest-check': @@ -378,17 +378,17 @@ for x in effective_scanlist: except KeyError: allvalid = False stats["ebuild.syntax"] += 1 - fails["ebuild.syntax"].append(os.path.join(x, y)) + fails["ebuild.syntax"].append(os.path.join(xpkg, y)) continue except IOError: allvalid = False stats["ebuild.output"] += 1 - fails["ebuild.output"].append(os.path.join(x, y)) + fails["ebuild.output"].append(os.path.join(xpkg, y)) continue if not portage.eapi_is_supported(myaux["EAPI"]): allvalid = False stats["EAPI.unsupported"] += 1 - fails["EAPI.unsupported"].append(os.path.join(x, y)) + fails["EAPI.unsupported"].append(os.path.join(xpkg, y)) continue pkgs[pf] = Package( cpv=cpv, metadata=myaux, root_config=root_config, @@ -462,7 +462,7 @@ for x in effective_scanlist: if l[:-1][-7:] == ".ebuild": stats["ebuild.notadded"] += 1 fails["ebuild.notadded"].append( - os.path.join(x, os.path.basename(l[:-1]))) + os.path.join(xpkg, os.path.basename(l[:-1]))) myf.close() if vcs_settings.vcs in ("cvs", "svn", "bzr") and check_ebuild_notadded: @@ -570,7 +570,7 @@ for x in effective_scanlist: # so people can't hide > 20k files in a subdirectory. while filesdirlist: y = filesdirlist.pop(0) - relative_path = os.path.join(x, "files", y) + relative_path = os.path.join(xpkg, "files", y) full_path = os.path.join(repo_settings.repodir, relative_path) try: mystat = os.stat(full_path) @@ -594,11 +594,11 @@ for x in effective_scanlist: elif mystat.st_size > 61440: stats["file.size.fatal"] += 1 fails["file.size.fatal"].append( - "(%d KiB) %s/files/%s" % (mystat.st_size // 1024, x, y)) + "(%d KiB) %s/files/%s" % (mystat.st_size // 1024, xpkg, y)) elif mystat.st_size > 20480: stats["file.size"] += 1 fails["file.size"].append( - "(%d KiB) %s/files/%s" % (mystat.st_size // 1024, x, y)) + "(%d KiB) %s/files/%s" % (mystat.st_size // 1024, xpkg, y)) index = repo_settings.repo_config.find_invalid_path_char(y) if index != -1: @@ -617,13 +617,13 @@ for x in effective_scanlist: if check_changelog and "ChangeLog" not in checkdirlist: stats["changelog.missing"] += 1 - fails["changelog.missing"].append(x + "/ChangeLog") + fails["changelog.missing"].append(xpkg + "/ChangeLog") musedict = {} # metadata.xml file check if "metadata.xml" not in checkdirlist: stats["metadata.missing"] += 1 - fails["metadata.missing"].append(x + "/metadata.xml") + fails["metadata.missing"].append(xpkg + "/metadata.xml") # metadata.xml parse check else: metadata_bad = False @@ -640,7 +640,7 @@ for x in effective_scanlist: except (ExpatError, SyntaxError, EnvironmentError) as e: metadata_bad = True stats["metadata.bad"] += 1 - fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) + fails["metadata.bad"].append("%s/metadata.xml: %s" % (xpkg, e)) del e else: if not hasattr(xml_parser, 'parser') or \ @@ -654,7 +654,7 @@ for x in effective_scanlist: fails["metadata.bad"].append( "%s/metadata.xml: " "xml declaration is missing on first line, " - "should be '%s'" % (x, metadata_xml_declaration)) + "should be '%s'" % (xpkg, metadata_xml_declaration)) else: xml_version, xml_encoding, xml_standalone = \ xml_info["XML_DECLARATION"] @@ -668,13 +668,13 @@ for x in effective_scanlist: fails["metadata.bad"].append( "%s/metadata.xml: " "xml declaration encoding should be '%s', %s" % - (x, metadata_xml_encoding, encoding_problem)) + (xpkg, metadata_xml_encoding, encoding_problem)) if "DOCTYPE" not in xml_info: metadata_bad = True stats["metadata.bad"] += 1 fails["metadata.bad"].append( - "%s/metadata.xml: %s" % (x, "DOCTYPE is missing")) + "%s/metadata.xml: %s" % (xpkg, "DOCTYPE is missing")) else: doctype_name, doctype_system, doctype_pubid = \ xml_info["DOCTYPE"] @@ -687,14 +687,14 @@ for x in effective_scanlist: fails["metadata.bad"].append( "%s/metadata.xml: " "DOCTYPE: SYSTEM should refer to '%s', %s" % - (x, metadata_dtd_uri, system_problem)) + (xpkg, metadata_dtd_uri, system_problem)) if doctype_name != metadata_doctype_name: stats["metadata.bad"] += 1 fails["metadata.bad"].append( "%s/metadata.xml: " "DOCTYPE: name should be '%s', not '%s'" % - (x, metadata_doctype_name, doctype_name)) + (xpkg, metadata_doctype_name, doctype_name)) # load USE flags from metadata.xml try: @@ -702,7 +702,7 @@ for x in effective_scanlist: except portage.exception.ParseError as e: metadata_bad = True stats["metadata.bad"] += 1 - fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) + fails["metadata.bad"].append("%s/metadata.xml: %s" % (xpkg, e)) else: for atom in chain(*musedict.values()): if atom is None: @@ -712,13 +712,13 @@ for x in effective_scanlist: except InvalidAtom as e: stats["metadata.bad"] += 1 fails["metadata.bad"].append( - "%s/metadata.xml: Invalid atom: %s" % (x, e)) + "%s/metadata.xml: Invalid atom: %s" % (xpkg, e)) else: - if atom.cp != x: + if atom.cp != xpkg: stats["metadata.bad"] += 1 fails["metadata.bad"].append( "%s/metadata.xml: Atom contains " - "unexpected cat/pn: %s" % (x, atom)) + "unexpected cat/pn: %s" % (xpkg, atom)) # Run other metadata.xml checkers try: @@ -726,7 +726,7 @@ for x in effective_scanlist: except (utilities.UnknownHerdsError, ) as e: metadata_bad = True stats["metadata.bad"] += 1 - fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) + fails["metadata.bad"].append("%s/metadata.xml: %s" % (xpkg, e)) del e ################# @@ -734,7 +734,7 @@ for x in effective_scanlist: if not metadata_bad: if not xmllint.check(checkdir): stats["metadata.bad"] += 1 - fails["metadata.bad"].append(x + "/metadata.xml") + fails["metadata.bad"].append(xpkg + "/metadata.xml") ################# del metadata_bad @@ -748,7 +748,7 @@ for x in effective_scanlist: for y in ebuildlist: ################## - ebuild = Ebuild(repo_settings, repolevel, pkgdir, catdir, vcs_settings, x, y) + ebuild = Ebuild(repo_settings, repolevel, pkgdir, catdir, vcs_settings, xpkg, y) ################## if check_changelog and not changelog_modified \ @@ -759,10 +759,10 @@ for x in effective_scanlist: if ebuild.untracked(check_ebuild_notadded, y, eadded): # ebuild not added to vcs stats["ebuild.notadded"] += 1 - fails["ebuild.notadded"].append(x + "/" + y + ".ebuild") + fails["ebuild.notadded"].append(xpkg + "/" + y + ".ebuild") myesplit = portage.pkgsplit(y) - is_bad_split = myesplit is None or myesplit[0] != x.split("/")[-1] + is_bad_split = myesplit is None or myesplit[0] != xpkg.split("/")[-1] if is_bad_split: is_pv_toolong = pv_toolong_re.search(myesplit[1]) @@ -770,12 +770,12 @@ for x in effective_scanlist: if is_pv_toolong or is_pv_toolong2: stats["ebuild.invalidname"] += 1 - fails["ebuild.invalidname"].append(x + "/" + y + ".ebuild") + fails["ebuild.invalidname"].append(xpkg + "/" + y + ".ebuild") continue elif myesplit[0] != pkgdir: print(pkgdir, myesplit[0]) stats["ebuild.namenomatch"] += 1 - fails["ebuild.namenomatch"].append(x + "/" + y + ".ebuild") + fails["ebuild.namenomatch"].append(xpkg + "/" + y + ".ebuild") continue pkg = pkgs[y] @@ -834,7 +834,7 @@ for x in effective_scanlist: continue myqakey = missingvars[pos] + ".missing" stats[myqakey] += 1 - fails[myqakey].append(x + "/" + y + ".ebuild") + fails[myqakey].append(xpkg + "/" + y + ".ebuild") if catdir == "virtual": for var in ("HOMEPAGE", "LICENSE"): @@ -868,7 +868,7 @@ for x in effective_scanlist: stats["KEYWORDS.stable"] += 1 fails["KEYWORDS.stable"].append( "%s/%s.ebuild added with stable keywords: %s" % - (x, y, " ".join(stable_keywords))) + (xpkg, y, " ".join(stable_keywords))) ebuild_archs = set( kw.lstrip("~") for kw in keywords if not kw.startswith("-")) @@ -897,7 +897,7 @@ for x in effective_scanlist: haskeyword = True if not haskeyword: stats["KEYWORDS.stupid"] += 1 - fails["KEYWORDS.stupid"].append(x + "/" + y + ".ebuild") + fails["KEYWORDS.stupid"].append(xpkg + "/" + y + ".ebuild") """ Ebuilds that inherit a "Live" eclass (darcs,subversion,git,cvs,etc..) should @@ -914,7 +914,7 @@ for x in effective_scanlist: stats["LIVEVCS.stable"] += 1 fails["LIVEVCS.stable"].append( "%s/%s.ebuild with stable keywords:%s " % - (x, y, bad_stable_keywords)) + (xpkg, y, bad_stable_keywords)) del bad_stable_keywords if keywords and not has_global_mask(pkg): @@ -1086,7 +1086,7 @@ for x in effective_scanlist: for mypos in range(len(myuse)): stats["IUSE.invalid"] += 1 - fails["IUSE.invalid"].append(x + "/" + y + ".ebuild: %s" % myuse[mypos]) + fails["IUSE.invalid"].append(xpkg + "/" + y + ".ebuild: %s" % myuse[mypos]) # Check for outdated RUBY targets old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"] @@ -1112,7 +1112,7 @@ for x in effective_scanlist: # function will remove it without removing values. if lic not in liclist and lic != "||": stats["LICENSE.invalid"] += 1 - fails["LICENSE.invalid"].append(x + "/" + y + ".ebuild: %s" % lic) + fails["LICENSE.invalid"].append(xpkg + "/" + y + ".ebuild: %s" % lic) elif lic in liclist_deprecated: stats["LICENSE.deprecated"] += 1 fails["LICENSE.deprecated"].append("%s: %s" % (ebuild.relative_path, lic)) @@ -1129,11 +1129,11 @@ for x in effective_scanlist: if myskey not in kwlist: stats["KEYWORDS.invalid"] += 1 fails["KEYWORDS.invalid"].append( - "%s/%s.ebuild: %s" % (x, y, mykey)) + "%s/%s.ebuild: %s" % (xpkg, y, mykey)) elif myskey not in profiles: stats["KEYWORDS.invalid"] += 1 fails["KEYWORDS.invalid"].append( - "%s/%s.ebuild: %s (profile invalid)" % (x, y, mykey)) + "%s/%s.ebuild: %s (profile invalid)" % (xpkg, y, mykey)) # restrict checks myrestrict = None @@ -1151,7 +1151,7 @@ for x in effective_scanlist: if mybadrestrict: stats["RESTRICT.invalid"] += len(mybadrestrict) for mybad in mybadrestrict: - fails["RESTRICT.invalid"].append(x + "/" + y + ".ebuild: %s" % mybad) + fails["RESTRICT.invalid"].append(xpkg + "/" + y + ".ebuild: %s" % mybad) # REQUIRED_USE check required_use = myaux["REQUIRED_USE"] if required_use: @@ -1370,7 +1370,7 @@ for x in effective_scanlist: stats["metadata.warning"] += 1 fails["metadata.warning"].append( "%s/metadata.xml: unused local USE-description: '%s'" % - (x, myflag)) + (xpkg, myflag)) if options.if_modified == "y" and len(effective_scanlist) < 1: logging.warn("--if-modified is enabled, but no modified packages were found!")