* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-09-24 15:24 Brian Dolbec
0 siblings, 0 replies; 9+ messages in thread
From: Brian Dolbec @ 2015-09-24 15:24 UTC (permalink / raw
To: gentoo-commits
commit: beb0b8ffa83e9d754909823a49e160b1873fdd74
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 24 15:19:30 2015 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 24 15:23:10 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=beb0b8ff
repoman/checks/ebuilds/fetches.py: Remove the incorrectly cached digests
The digests were incorrectly being cached.
At this point in the operation the digests must be loaded each time since they are for a
different pkg.
pym/repoman/checks/ebuilds/fetches.py | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/fetches.py b/pym/repoman/checks/ebuilds/fetches.py
index 53ed64f..0b9c321 100644
--- a/pym/repoman/checks/ebuilds/fetches.py
+++ b/pym/repoman/checks/ebuilds/fetches.py
@@ -29,7 +29,6 @@ class FetchChecks(object):
self.repo_settings = repo_settings
self.repoman_settings = repoman_settings
self.vcs_settings = vcs_settings
- self._digests = None
def check(self, xpkg, checkdir, checkdir_relative, mychanged, mynew):
'''Checks the ebuild sources and files for errors
@@ -38,7 +37,7 @@ class FetchChecks(object):
@param checkdir: string, directory path
@param checkdir_relative: repolevel determined path
'''
- self.checkdir = checkdir
+ _digests = self.digests(checkdir)
fetchlist_dict = portage.FetchlistDict(
checkdir, self.repoman_settings, self.portdb)
myfiles_all = []
@@ -64,11 +63,11 @@ class FetchChecks(object):
# produce a valid error elsewhere, such as "SRC_URI.syntax"
# or "ebuild.sytax".
myfiles_all = set(myfiles_all)
- for entry in self.digests:
+ for entry in _digests:
if entry not in myfiles_all:
self.qatracker.add_error("digest.unused", checkdir + "::" + entry)
for entry in myfiles_all:
- if entry not in self.digests:
+ if entry not in _digests:
self.qatracker.add_error("digest.missing", checkdir + "::" + entry)
del myfiles_all
@@ -125,14 +124,11 @@ class FetchChecks(object):
"file.name",
"%s/files/%s: char '%s'" % (checkdir, y, y[index]))
- @property
- def digests(self):
- '''Property function, returns the saved digests or
- loads them for the test'''
- if not self._digests:
- mf = self.repoman_settings.repositories.get_repo_for_location(
- os.path.dirname(os.path.dirname(self.checkdir)))
- mf = mf.load_manifest(self.checkdir, self.repoman_settings["DISTDIR"])
- self._digests = mf.getTypeDigests("DIST")
- del mf
- return self._digests
+ def digests(self, checkdir):
+ '''Returns the freshly loaded digests'''
+ mf = self.repoman_settings.repositories.get_repo_for_location(
+ os.path.dirname(os.path.dirname(checkdir)))
+ mf = mf.load_manifest(checkdir, self.repoman_settings["DISTDIR"])
+ _digests = mf.getTypeDigests("DIST")
+ del mf
+ return _digests
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-10-12 14:47 Michał Górny
0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2015-10-12 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 74f57af1ed32615083b3871945ce6bf859f92f0f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 07:18:43 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 14:46:41 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=74f57af1
repoman: deprecated_classes -> ...eclasses, to ease grep
Rename deprecated_classes list to deprecated_eclasses, since the latter
is less ambiguous and easier to find.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Acked-by: Alexander Berntsen <bernalex <AT> gentoo.org>
pym/repoman/checks/ebuilds/checks.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 245ab2b..ae6d96e 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -408,7 +408,7 @@ class InheritDeprecated(LineCheck):
repoman_check_name = 'inherit.deprecated'
# deprecated eclass : new eclass (False if no new eclass)
- deprecated_classes = {
+ deprecated_eclasses = {
"bash-completion": "bash-completion-r1",
"boost-utils": False,
"distutils": "distutils-r1",
@@ -436,7 +436,7 @@ class InheritDeprecated(LineCheck):
return
for eclass in direct_inherits:
- replacement = self.deprecated_classes.get(eclass)
+ replacement = self.deprecated_eclasses.get(eclass)
if replacement is None:
pass
elif replacement is False:
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-10-12 14:47 Michał Górny
0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2015-10-12 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 79ca850d9c14b5494ddcce6ac42c730255c4d243
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 11 07:20:27 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 14:46:54 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=79ca850d
repoman: Finally deprecate base.eclass
Contributors are repeatedly adding base.eclass uses, so we should
finally make the deprecation formal, even at the cost of adding warnings
for some frequently used eclasses.
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
Acked-by: Zac Medico <zmedico <AT> gentoo.org>
pym/repoman/checks/ebuilds/checks.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index ae6d96e..a00d518 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -409,6 +409,7 @@ class InheritDeprecated(LineCheck):
# deprecated eclass : new eclass (False if no new eclass)
deprecated_eclasses = {
+ "base": False,
"bash-completion": "bash-completion-r1",
"boost-utils": False,
"distutils": "distutils-r1",
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-11-16 18:19 Michał Górny
0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2015-11-16 18:19 UTC (permalink / raw
To: gentoo-commits
commit: c0ee8623da8dc54b5d4c76e7db87acf24f089ff9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 16:57:27 2015 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 16:57:58 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c0ee8623
repoman: Update in_iuse & get_libdir inherit check for EAPI 6
Update the eclass inherit check not to complain about in_iuse and
get_libdir in EAPI 6 since they no longer require the respective
eclasses.
pym/repoman/checks/ebuilds/checks.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index a00d518..e23fcfe 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -524,8 +524,13 @@ class InheritEclass(LineCheck):
yield 'no function called from %s.eclass; please drop' % self._eclass
_usex_supported_eapis = ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
+_in_iuse_supported_eapis = ("0", "1", "2", "3", "4", "4-python", "4-slot-abi",
+ "5", "5-hdepend", "5-progress")
+_get_libdir_supported_eapis = _in_iuse_supported_eapis
_eclass_eapi_functions = {
- "usex": lambda eapi: eapi not in _usex_supported_eapis
+ "usex": lambda eapi: eapi not in _usex_supported_eapis,
+ "in_iuse": lambda eapi: eapi not in _in_iuse_supported_eapis,
+ "get_libdir": lambda eapi: eapi not in _get_libdir_supported_eapis,
}
# eclasses that export ${ECLASS}_src_(compile|configure|install)
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-12-20 21:56 Ulrich Müller
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Müller @ 2015-12-20 21:56 UTC (permalink / raw
To: gentoo-commits
commit: f7d987866e6e41130fe8b4d9f2046eb5d200abe8
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 20:46:03 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 21:54:39 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7d98786
repoman: Do not check for PATCHES array in EAPI 6 and later.
EAPI 6 explicitly added support for non-array PATCHES in its
default_src_prepare, therefore remove this warning.
X-Gentoo-Bug: 568054
Acked-by: Zac Medico <zmedico <AT> gentoo.org>
pym/repoman/checks/ebuilds/checks.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index e23fcfe..6d562de 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -337,6 +337,10 @@ class EbuildPatches(LineCheck):
re = re.compile(r'^\s*PATCHES=[^\(]')
error = errors.PATCHES_ERROR
+ def check_eapi(self, eapi):
+ return eapi in ("0", "1", "2", "3", "4", "4-python",
+ "4-slot-abi", "5", "5-hdepend", "5-progress")
+
class EbuildQuotedA(LineCheck):
"""Ensure ebuilds have no quoting around ${A}"""
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-12-29 16:56 Zac Medico
0 siblings, 0 replies; 9+ messages in thread
From: Zac Medico @ 2015-12-29 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 3fb1a213878a7c2df231141856ad9eb0e31d5d28
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 17:04:30 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 16:54:20 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=3fb1a213
repoman: add older gstreamer eclass to inherit.deprecated check
pym/repoman/checks/ebuilds/checks.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 6d562de..9f72324 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -422,6 +422,11 @@ class InheritDeprecated(LineCheck):
"python": "python-r1 / python-single-r1 / python-any-r1",
"ruby": "ruby-ng",
"x-modular": "xorg-2",
+ "gst-plugins-bad": "gstreamer",
+ "gst-plugins-base": "gstreamer",
+ "gst-plugins-good": "gstreamer",
+ "gst-plugins-ugly": "gstreamer",
+ "gst-plugins10": "gstreamer",
}
_inherit_re = re.compile(r'^\s*inherit\s(.*)$')
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2015-12-29 16:56 Zac Medico
0 siblings, 0 replies; 9+ messages in thread
From: Zac Medico @ 2015-12-29 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 57c63e9e5468670ea976d1fae960cd20259ea019
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 26 17:05:59 2015 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Dec 29 16:55:06 2015 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=57c63e9e
repoman: add clutter to inherit.deprecated, bug #486362
pym/repoman/checks/ebuilds/checks.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 9f72324..7bab8e4 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -427,6 +427,7 @@ class InheritDeprecated(LineCheck):
"gst-plugins-good": "gstreamer",
"gst-plugins-ugly": "gstreamer",
"gst-plugins10": "gstreamer",
+ "clutter": "gnome2",
}
_inherit_re = re.compile(r'^\s*inherit\s(.*)$')
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2016-01-20 23:55 Zac Medico
0 siblings, 0 replies; 9+ messages in thread
From: Zac Medico @ 2016-01-20 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 363ff286249e8879f05f6d19ba05d1f4b491832d
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 07:13:31 2016 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Jan 20 23:54:31 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=363ff286
repoman: fix _here_doc_re to handle file redirection
This suppresses "Unquoted Variable" warnings for sys-apps/portage ebuilds
where a here-doc is used to generate repos.conf:
ebuild.minorsyn 6
sys-apps/portage/portage-2.2.8-r2.ebuild: Unquoted Variable on line: 496
sys-apps/portage/portage-2.2.20.1.ebuild: Unquoted Variable on line: 290
sys-apps/portage/portage-2.2.23.ebuild: Unquoted Variable on line: 290
sys-apps/portage/portage-2.2.24.ebuild: Unquoted Variable on line: 290
sys-apps/portage/portage-2.2.25.ebuild: Unquoted Variable on line: 290
sys-apps/portage/portage-2.2.26.ebuild: Unquoted Variable on line: 294
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/repoman/checks/ebuilds/checks.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 7bab8e4..5420e51 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -920,7 +920,7 @@ def checks_init(experimental_inherit=False):
for k, kwargs in _eclass_info.items())))
-_here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$')
+_here_doc_re = re.compile(r'.*<<[-]?(\w+)\s*(>\s*\S+\s*)?$')
_ignore_comment_re = re.compile(r'^\s*#')
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/
@ 2016-02-13 16:48 Michał Górny
0 siblings, 0 replies; 9+ messages in thread
From: Michał Górny @ 2016-02-13 16:48 UTC (permalink / raw
To: gentoo-commits
commit: 8504698e23dd3c51451ce9137fc74f66366a542d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 16:39:16 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 16:48:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=8504698e
repoman: Deprecate games.eclass, #574082
Reviewed-by: Brian Dolbec <dolsen <AT> gentoo.org>
pym/repoman/checks/ebuilds/checks.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/pym/repoman/checks/ebuilds/checks.py b/pym/repoman/checks/ebuilds/checks.py
index 5420e51..7894e2b 100644
--- a/pym/repoman/checks/ebuilds/checks.py
+++ b/pym/repoman/checks/ebuilds/checks.py
@@ -417,6 +417,7 @@ class InheritDeprecated(LineCheck):
"bash-completion": "bash-completion-r1",
"boost-utils": False,
"distutils": "distutils-r1",
+ "games": False,
"gems": "ruby-fakegem",
"mono": "mono-env",
"python": "python-r1 / python-single-r1 / python-any-r1",
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-02-13 16:49 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-12 14:47 [gentoo-commits] proj/portage:master commit in: pym/repoman/checks/ebuilds/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2016-02-13 16:48 Michał Górny
2016-01-20 23:55 Zac Medico
2015-12-29 16:56 Zac Medico
2015-12-29 16:56 Zac Medico
2015-12-20 21:56 Ulrich Müller
2015-11-16 18:19 Michał Górny
2015-10-12 14:47 Michał Górny
2015-09-24 15:24 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox